summaryrefslogtreecommitdiff
path: root/sound/soc/codecs/wm8750.c
diff options
context:
space:
mode:
authorMark Brown <broonie@opensource.wolfsonmicro.com>2011-08-14 14:19:58 +0400
committerMark Brown <broonie@opensource.wolfsonmicro.com>2011-08-14 14:19:58 +0400
commitafe8db5f756ceb017dbcf2800f9a7302ee49a385 (patch)
treed63ae32af5d346a373a6cb64066362828f457f04 /sound/soc/codecs/wm8750.c
parentdc5de62be6138dd141e78a454e9af0fd88d1eec8 (diff)
parenta115c72802c37351b6d87dfb62938d2ad440eef4 (diff)
downloadlinux-afe8db5f756ceb017dbcf2800f9a7302ee49a385.tar.xz
Merge branch 'for-3.1' into for-3.2
Diffstat (limited to 'sound/soc/codecs/wm8750.c')
-rw-r--r--sound/soc/codecs/wm8750.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/soc/codecs/wm8750.c b/sound/soc/codecs/wm8750.c
index 3f2aeec309a7..15f03721ec6f 100644
--- a/sound/soc/codecs/wm8750.c
+++ b/sound/soc/codecs/wm8750.c
@@ -789,7 +789,7 @@ static int __devexit wm8750_spi_remove(struct spi_device *spi)
static const struct spi_device_id wm8750_spi_ids[] = {
{ "wm8750", 0 },
{ "wm8987", 0 },
- { 0, 0 },
+ { },
};
MODULE_DEVICE_TABLE(spi, wm8750_spi_ids);