aboutsummaryrefslogtreecommitdiffstats
path: root/sound/soc/codecs/wm8711.c
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2009-10-01 01:39:45 -0400
committerTakashi Iwai <tiwai@suse.de>2009-10-01 01:39:45 -0400
commitbb26276744a80d066681836f4d49c70010b129d6 (patch)
tree4c2aceb441775c573bba0d8b6ec82564d0d4d7cd /sound/soc/codecs/wm8711.c
parentf34762b64704814838619c1d258bebf19004f5cd (diff)
ASoC: Fix build errors of wm8711.c with SPI
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>
Diffstat (limited to 'sound/soc/codecs/wm8711.c')
-rw-r--r--sound/soc/codecs/wm8711.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/sound/soc/codecs/wm8711.c b/sound/soc/codecs/wm8711.c
index ae083eb92fb7..90ec8c58e2f4 100644
--- a/sound/soc/codecs/wm8711.c
+++ b/sound/soc/codecs/wm8711.c
@@ -19,6 +19,7 @@
19#include <linux/pm.h> 19#include <linux/pm.h>
20#include <linux/i2c.h> 20#include <linux/i2c.h>
21#include <linux/platform_device.h> 21#include <linux/platform_device.h>
22#include <linux/spi/spi.h>
22#include <sound/core.h> 23#include <sound/core.h>
23#include <sound/pcm.h> 24#include <sound/pcm.h>
24#include <sound/pcm_params.h> 25#include <sound/pcm_params.h>
@@ -632,9 +633,9 @@ static int __init wm8711_modinit(void)
632 } 633 }
633#endif 634#endif
634#if defined(CONFIG_SPI_MASTER) 635#if defined(CONFIG_SPI_MASTER)
635 ret = spi_register_driver(&wm8731_spi_driver); 636 ret = spi_register_driver(&wm8711_spi_driver);
636 if (ret != 0) { 637 if (ret != 0) {
637 printk(KERN_ERR "Failed to register WM8731 SPI driver: %d\n", 638 printk(KERN_ERR "Failed to register WM8711 SPI driver: %d\n",
638 ret); 639 ret);
639 } 640 }
640#endif 641#endif
@@ -648,7 +649,7 @@ static void __exit wm8711_exit(void)
648 i2c_del_driver(&wm8711_i2c_driver); 649 i2c_del_driver(&wm8711_i2c_driver);
649#endif 650#endif
650#if defined(CONFIG_SPI_MASTER) 651#if defined(CONFIG_SPI_MASTER)
651 spi_unregister_driver(&wm8731_spi_driver); 652 spi_unregister_driver(&wm8711_spi_driver);
652#endif 653#endif
653} 654}
654module_exit(wm8711_exit); 655module_exit(wm8711_exit);