]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commitdiff
ASoC: Fix build errors of wm8711.c with SPI
authorTakashi Iwai <tiwai@suse.de>
Thu, 1 Oct 2009 05:39:45 +0000 (07:39 +0200)
committerTakashi Iwai <tiwai@suse.de>
Thu, 1 Oct 2009 05:39:45 +0000 (07:39 +0200)
Fix a couple of typos and a missing header file inclusion to build wm8711.c
properly with CONFIG_SPI_MASTER.

Signed-off-by: Takashi Iwai <tiwai@suse.de>
sound/soc/codecs/wm8711.c

index ae083eb92fb7139c2c96aca38589dd6c9a82ceb0..90ec8c58e2f4679d4d8869ebb1dc0a3998dbf5d7 100644 (file)
@@ -19,6 +19,7 @@
 #include <linux/pm.h>
 #include <linux/i2c.h>
 #include <linux/platform_device.h>
+#include <linux/spi/spi.h>
 #include <sound/core.h>
 #include <sound/pcm.h>
 #include <sound/pcm_params.h>
@@ -632,9 +633,9 @@ static int __init wm8711_modinit(void)
        }
 #endif
 #if defined(CONFIG_SPI_MASTER)
-       ret = spi_register_driver(&wm8731_spi_driver);
+       ret = spi_register_driver(&wm8711_spi_driver);
        if (ret != 0) {
-               printk(KERN_ERR "Failed to register WM8731 SPI driver: %d\n",
+               printk(KERN_ERR "Failed to register WM8711 SPI driver: %d\n",
                       ret);
        }
 #endif
@@ -648,7 +649,7 @@ static void __exit wm8711_exit(void)
        i2c_del_driver(&wm8711_i2c_driver);
 #endif
 #if defined(CONFIG_SPI_MASTER)
-       spi_unregister_driver(&wm8731_spi_driver);
+       spi_unregister_driver(&wm8711_spi_driver);
 #endif
 }
 module_exit(wm8711_exit);