Merge branch 'for-3.2' into for-3.3

21abbb02 · Mark Brown · 6664ee11 · f8f626f5 · 21abbb02 · 21abbb02
Commit 21abbb02 authored Dec 06, 2011 by Mark Brown
Show whitespace changes
Inline Side-by-side

Showing with 2 additions and 1 deletion

sound/soc/codecs/Kconfig sound/soc/codecs/Kconfig +1 -1

sound/soc/codecs/jz4740.c sound/soc/codecs/jz4740.c +1 -0

No files found.
--- a/sound/soc/codecs/Kconfig
+++ b/sound/soc/codecs/Kconfig
@@ -35,7 +35,7 @@ config SND_SOC_ALL_CODECS
 	select SND_SOC_CX20442
 	select SND_SOC_DA7210 if I2C
 	select SND_SOC_DFBMCS320
-	select SND_SOC_JZ4740_CODEC if SOC_JZ4740
+	select SND_SOC_JZ4740_CODEC
 	select SND_SOC_LM4857 if I2C
 	select SND_SOC_MAX98088 if I2C
 	select SND_SOC_MAX98095 if I2C

--- a/sound/soc/codecs/jz4740.c
+++ b/sound/soc/codecs/jz4740.c
@@ -15,6 +15,7 @@
 #include <linux/module.h>
 #include <linux/platform_device.h>
 #include <linux/slab.h>
+#include <linux/io.h>

 #include <linux/delay.h>