diff options
| author | Paul Mundt <lethal@linux-sh.org> | 2010-08-16 13:32:24 +0900 |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2010-08-16 13:32:24 +0900 |
| commit | bbcf6e8b66ab2fb5ddab4d0fe40c2e6a5ebe5301 (patch) | |
| tree | 071fa9f86dc04a16570be367d04cff3b00c694ad /sound/soc/jz4740/Kconfig | |
| parent | 57682827b9a5edb52e33af0be9082b51bffcd5c7 (diff) | |
| parent | da5cabf80e2433131bf0ed8993abc0f7ea618c73 (diff) | |
| download | op-kernel-dev-bbcf6e8b66ab2fb5ddab4d0fe40c2e6a5ebe5301.zip op-kernel-dev-bbcf6e8b66ab2fb5ddab4d0fe40c2e6a5ebe5301.tar.gz | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Conflicts:
arch/sh/include/asm/Kbuild
drivers/Makefile
Signed-off-by: Paul Mundt <lethal@linux-sh.org>
Diffstat (limited to 'sound/soc/jz4740/Kconfig')
| -rw-r--r-- | sound/soc/jz4740/Kconfig | 23 |
1 files changed, 23 insertions, 0 deletions
diff --git a/sound/soc/jz4740/Kconfig b/sound/soc/jz4740/Kconfig new file mode 100644 index 0000000..5351cba --- /dev/null +++ b/sound/soc/jz4740/Kconfig @@ -0,0 +1,23 @@ +config SND_JZ4740_SOC + tristate "SoC Audio for Ingenic JZ4740 SoC" + depends on MACH_JZ4740 && SND_SOC + help + Say Y or M if you want to add support for codecs attached to + the JZ4740 I2S interface. You will also need to select the audio + interfaces to support below. + +config SND_JZ4740_SOC_I2S + depends on SND_JZ4740_SOC + tristate "SoC Audio (I2S protocol) for Ingenic JZ4740 SoC" + help + Say Y if you want to use I2S protocol and I2S codec on Ingenic JZ4740 + based boards. + +config SND_JZ4740_SOC_QI_LB60 + tristate "SoC Audio support for Qi LB60" + depends on SND_JZ4740_SOC && JZ4740_QI_LB60 + select SND_JZ4740_SOC_I2S + select SND_SOC_JZ4740_CODEC + help + Say Y if you want to add support for ASoC audio on the Qi LB60 board + a.k.a Qi Ben NanoNote. |
