diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2010-11-25 06:17:24 -0500 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2010-11-25 06:17:24 -0500 |
| commit | 2c54c1586c78775cfdfb071e68b27e14b668921f (patch) | |
| tree | cf57390a0b82d2bd1ade5e5356434c66c39af38a /sound/soc/pxa | |
| parent | b26bb71f610f9b346203bff407e4278d98f9fe80 (diff) | |
| parent | 8b6b30ab665d3bbb23180c39f6215e6f64516ed0 (diff) | |
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 @@ | |||
| 1 | config SND_PXA2XX_SOC | 1 | config SND_PXA2XX_SOC |
| 2 | tristate "SoC Audio for the Intel PXA2xx chip" | 2 | tristate "SoC Audio for the Intel PXA2xx chip" |
| 3 | depends on ARCH_PXA | 3 | depends on ARCH_PXA |
| 4 | select SND_ARM | ||
| 4 | select SND_PXA2XX_LIB | 5 | select SND_PXA2XX_LIB |
| 5 | help | 6 | help |
| 6 | Say Y or M if you want to add support for codecs attached to | 7 | Say Y or M if you want to add support for codecs attached to |