summaryrefslogtreecommitdiff
path: root/sound/soc/pxa/Kconfig
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2011-05-22 12:01:33 +0400
committerTakashi Iwai <tiwai@suse.de>2011-05-22 12:01:33 +0400
commit7ec298dfef00e2c8effe8658011e03d86911b0bf (patch)
treedd62232006547b861a2731fe49c26367d3e9422c /sound/soc/pxa/Kconfig
parent02e5fbf622aabf68bdc02282a17a3aeed054237a (diff)
parentde0853c000aa3b5c9983d066c137e5dc9c8355a0 (diff)
downloadlinux-7ec298dfef00e2c8effe8658011e03d86911b0bf.tar.xz
Merge branch 'topic/asoc' into for-linus
Diffstat (limited to 'sound/soc/pxa/Kconfig')
-rw-r--r--sound/soc/pxa/Kconfig9
1 files changed, 9 insertions, 0 deletions
diff --git a/sound/soc/pxa/Kconfig b/sound/soc/pxa/Kconfig
index 580f48571303..33ebc46b45b5 100644
--- a/sound/soc/pxa/Kconfig
+++ b/sound/soc/pxa/Kconfig
@@ -155,6 +155,15 @@ config SND_SOC_RAUMFELD
help
Say Y if you want to add support for SoC audio on Raumfeld devices
+config SND_PXA2XX_SOC_HX4700
+ tristate "SoC Audio support for HP iPAQ hx4700"
+ depends on SND_PXA2XX_SOC && MACH_H4700
+ select SND_PXA2XX_SOC_I2S
+ select SND_SOC_AK4641
+ help
+ Say Y if you want to add support for SoC audio on the
+ HP iPAQ hx4700.
+
config SND_PXA2XX_SOC_MAGICIAN
tristate "SoC Audio support for HTC Magician"
depends on SND_PXA2XX_SOC && MACH_MAGICIAN