Merge branch 'for-3.1' into for-3.2

diff --git a/sound/soc/codecs/wm8750.c b/sound/soc/codecs/wm8750.c
index 65fe78aa37579fcc2cef105d611696eaaad263b3..e6f47f49357d942a402d6192fede79442b43ff36 100644 (file)
--- a/sound/soc/codecs/wm8750.c
+++ b/sound/soc/codecs/wm8750.c
@@ -782,7 +782,7 @@ static const struct spi_device_id wm8750_spi_ids[] = {
        { "wm8750", 0 },
        { "wm8987", 0 },
 };
-MODULE_DEVICE_TABLE(spi, wm8750_spi_id);
+MODULE_DEVICE_TABLE(spi, wm8750_spi_ids);
 
 static struct spi_driver wm8750_spi_driver = {
        .driver = {