Merge branch 'for-3.1' into for-3.2

2011-08-14 19:19:58 +09:00
parent dc5de62be6 a115c72802
commit afe8db5f75
2 changed files with 5 additions and 5 deletions
--- 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);