Merge branch 'for-3.1' into for-3.2

29571ad6 · Mark Brown · c38071c0 · 511d8cf0 · 29571ad6
Commit 29571ad6 authored Aug 10, 2011 by Mark Brown
Show whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

sound/soc/codecs/wm8750.c sound/soc/codecs/wm8750.c +1 -1

No files found.
--- 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 = {