diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-12-06 06:01:38 -0500 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-12-06 06:01:38 -0500 |
| commit | 21abbb024fb782f176d7e9ddd3bef8207d024227 (patch) | |
| tree | 706237be9d5c2d908408622851edfc1f63ab144f /sound | |
| parent | 6664ee115bb45d912d64d1c6b26bd3b96ef7df09 (diff) | |
| parent | f8f626f537aee0da878d287e0d7694b7b76d599a (diff) | |
Merge branch 'for-3.2' into for-3.3
Diffstat (limited to 'sound')
| -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 bc2364aced1b..7c205e77d83a 100644 --- a/sound/soc/codecs/Kconfig +++ b/sound/soc/codecs/Kconfig | |||
| @@ -35,7 +35,7 @@ config SND_SOC_ALL_CODECS | |||
| 35 | select SND_SOC_CX20442 | 35 | select SND_SOC_CX20442 |
| 36 | select SND_SOC_DA7210 if I2C | 36 | select SND_SOC_DA7210 if I2C |
| 37 | select SND_SOC_DFBMCS320 | 37 | select SND_SOC_DFBMCS320 |
| 38 | select SND_SOC_JZ4740_CODEC if SOC_JZ4740 | 38 | select SND_SOC_JZ4740_CODEC |
| 39 | select SND_SOC_LM4857 if I2C | 39 | select SND_SOC_LM4857 if I2C |
| 40 | select SND_SOC_MAX98088 if I2C | 40 | select SND_SOC_MAX98088 if I2C |
| 41 | select SND_SOC_MAX98095 if I2C | 41 | select SND_SOC_MAX98095 if I2C |
diff --git a/sound/soc/codecs/jz4740.c b/sound/soc/codecs/jz4740.c index 517e2a516daf..d73d28317c00 100644 --- a/sound/soc/codecs/jz4740.c +++ b/sound/soc/codecs/jz4740.c | |||
| @@ -15,6 +15,7 @@ | |||
| 15 | #include <linux/module.h> | 15 | #include <linux/module.h> |
| 16 | #include <linux/platform_device.h> | 16 | #include <linux/platform_device.h> |
| 17 | #include <linux/slab.h> | 17 | #include <linux/slab.h> |
| 18 | #include <linux/io.h> | ||
| 18 | 19 | ||
| 19 | #include <linux/delay.h> | 20 | #include <linux/delay.h> |
| 20 | 21 | ||