diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2010-03-22 13:23:46 -0400 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2010-03-22 13:23:46 -0400 |
| commit | 74511020dde10252f8b8e648690d99dba721de14 (patch) | |
| tree | 04fc22bc7dd5d5b8d9294b2e57985b093858bd84 /sound/soc/imx | |
| parent | 69266866a5790080d7fe80094b28d670ff8aa765 (diff) | |
| parent | 3cc4e53f86dab635166929bfa47cc68d59b28c26 (diff) | |
Merge branch 'for-2.6.34' into for-2.6.35
Diffstat (limited to 'sound/soc/imx')
| -rw-r--r-- | sound/soc/imx/Kconfig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/soc/imx/Kconfig b/sound/soc/imx/Kconfig index c045da8ff61c..eba9b9d257a1 100644 --- a/sound/soc/imx/Kconfig +++ b/sound/soc/imx/Kconfig | |||
| @@ -1,6 +1,6 @@ | |||
| 1 | config SND_IMX_SOC | 1 | config SND_IMX_SOC |
| 2 | tristate "SoC Audio for Freescale i.MX CPUs" | 2 | tristate "SoC Audio for Freescale i.MX CPUs" |
| 3 | depends on ARCH_MXC && BROKEN | 3 | depends on ARCH_MXC |
| 4 | select SND_PCM | 4 | select SND_PCM |
| 5 | select FIQ | 5 | select FIQ |
| 6 | select SND_SOC_AC97_BUS | 6 | select SND_SOC_AC97_BUS |