leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'for-3.2' into for-3.3

Browse Source
This commit is contained in:
Mark Brown 2011-12-06 11:01:38 +00:00
commit 21abbb024f
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
sound/soc/codecs/Kconfig
View File

@ -35,7 +35,7 @@ config SND_SOC_ALL_CODECS
select SND_SOC_CX20442 select SND_SOC_CX20442
select SND_SOC_DA7210 if I2C select SND_SOC_DA7210 if I2C
select SND_SOC_DFBMCS320 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_LM4857 if I2C
select SND_SOC_MAX98088 if I2C select SND_SOC_MAX98088 if I2C
select SND_SOC_MAX98095 if I2C select SND_SOC_MAX98095 if I2C

1
sound/soc/codecs/jz4740.c
View File

@ -15,6 +15,7 @@
#include <linux/module.h> #include <linux/module.h>
#include <linux/platform_device.h> #include <linux/platform_device.h>
#include <linux/slab.h> #include <linux/slab.h>
#include <linux/io.h>
#include <linux/delay.h> #include <linux/delay.h>