Merge branch 'for-3.1' into for-3.2

2011-08-11 12:30:26 +09:00 · 2011-08-11 12:30:26 +09:00 · 10645a7c68
parent 4158a05741 feb00dceb5
commit 10645a7c68
1 changed files with 1 additions and 0 deletions
--- a/sound/soc/codecs/wm8750.c
+++ b/sound/soc/codecs/wm8750.c
@ -781,6 +781,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);