Home Explore Help
Register Sign In
phyus
/
linux-vybrid_public
8
0
Fork 0
Files Issues 0 Pull Requests 0 Wiki
Browse Source

Merge branch 'for-3.2' into for-3.3

Mark Brown 13 years ago
parent
6664ee115b f8f626f537
commit
21abbb024f
2 changed files with 2 additions and 1 deletions
Split View Show Diff Stats
  1. 1 1
      sound/soc/codecs/Kconfig
  2. 1 0
      sound/soc/codecs/jz4740.c

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

@@ -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

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

@@ -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>