diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-12-06 11:01:38 +0000 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-12-06 11:01:38 +0000 |
| commit | 21abbb024fb782f176d7e9ddd3bef8207d024227 (patch) | |
| tree | 706237be9d5c2d908408622851edfc1f63ab144f | |
| parent | 6664ee115bb45d912d64d1c6b26bd3b96ef7df09 (diff) | |
| parent | f8f626f537aee0da878d287e0d7694b7b76d599a (diff) | |
| download | op-kernel-dev-21abbb024fb782f176d7e9ddd3bef8207d024227.zip op-kernel-dev-21abbb024fb782f176d7e9ddd3bef8207d024227.tar.gz | |
Merge branch 'for-3.2' into for-3.3
| -rw-r--r-- | sound/soc/codecs/Kconfig | 2 | ||||
| -rw-r--r-- | sound/soc/codecs/jz4740.c | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/sound/soc/codecs/Kconfig b/sound/soc/codecs/Kconfig index bc2364ac..7c205e7 100644 --- 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 diff --git a/sound/soc/codecs/jz4740.c b/sound/soc/codecs/jz4740.c index 517e2a5..d73d283 100644 --- 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> |
