diff options
author | Mark Brown | 2010-11-25 12:17:24 +0100 |
---|---|---|
committer | Mark Brown | 2010-11-25 12:17:24 +0100 |
commit | 2c54c1586c78775cfdfb071e68b27e14b668921f (patch) | |
tree | cf57390a0b82d2bd1ade5e5356434c66c39af38a /sound/soc/pxa | |
parent | ASoC: smdk_wm9713: fix resource leak in smdk_init error path (diff) | |
parent | ASoC: davinci-vcif - fix a memory leak (diff) | |
download | kernel-qcow2-linux-2c54c1586c78775cfdfb071e68b27e14b668921f.tar.gz kernel-qcow2-linux-2c54c1586c78775cfdfb071e68b27e14b668921f.tar.xz kernel-qcow2-linux-2c54c1586c78775cfdfb071e68b27e14b668921f.zip |
Merge branch 'for-2.6.37' into for-2.6.38
Diffstat (limited to 'sound/soc/pxa')
-rw-r--r-- | sound/soc/pxa/Kconfig | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/sound/soc/pxa/Kconfig b/sound/soc/pxa/Kconfig index 37f191bbfdd9..580f48571303 100644 --- a/sound/soc/pxa/Kconfig +++ b/sound/soc/pxa/Kconfig @@ -1,6 +1,7 @@ config SND_PXA2XX_SOC tristate "SoC Audio for the Intel PXA2xx chip" depends on ARCH_PXA + select SND_ARM select SND_PXA2XX_LIB help Say Y or M if you want to add support for codecs attached to |