diff options
author | Russell King | 2011-03-10 13:53:29 +0000 |
---|---|---|
committer | Russell King | 2011-03-10 13:53:29 +0000 |
commit | 3afdb0f3528991de0833224f2dba60dc061e01fa (patch) | |
tree | 0d9c7529c6cc2b41f0df778cc396edd74699721a /sound/soc | |
parent | 71d8c5b11e3b5936ae6c2e0b1dd6f5c78b305b65 (diff) | |
parent | f7fdaca910e6bc13659ecdffc28c97938b752e01 (diff) |
Merge branch 'for-rmk' of git://git.pengutronix.de/git/imx/linux-2.6 into devel-stable
Diffstat (limited to 'sound/soc')
-rw-r--r-- | sound/soc/imx/Kconfig | 3 | ||||
-rw-r--r-- | sound/soc/imx/eukrea-tlv320.c | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/sound/soc/imx/Kconfig b/sound/soc/imx/Kconfig index 642270a635ea..9eeb8f0d67e9 100644 --- a/sound/soc/imx/Kconfig +++ b/sound/soc/imx/Kconfig @@ -44,7 +44,8 @@ config SND_SOC_EUKREA_TLV320 tristate "Eukrea TLV320" depends on MACH_EUKREA_MBIMX27_BASEBOARD \ || MACH_EUKREA_MBIMXSD25_BASEBOARD \ - || MACH_EUKREA_MBIMXSD35_BASEBOARD + || MACH_EUKREA_MBIMXSD35_BASEBOARD \ + || MACH_EUKREA_MBIMXSD51_BASEBOARD select SND_SOC_TLV320AIC23 select SND_MXC_SOC_SSI select SND_MXC_SOC_FIQ diff --git a/sound/soc/imx/eukrea-tlv320.c b/sound/soc/imx/eukrea-tlv320.c index e20c9e1457c0..a08e822e0158 100644 --- a/sound/soc/imx/eukrea-tlv320.c +++ b/sound/soc/imx/eukrea-tlv320.c @@ -98,7 +98,8 @@ static int __init eukrea_tlv320_init(void) int ret; if (!machine_is_eukrea_cpuimx27() && !machine_is_eukrea_cpuimx25sd() - && !machine_is_eukrea_cpuimx35sd()) + && !machine_is_eukrea_cpuimx35sd() + && !machine_is_eukrea_cpuimx51sd()) /* return happy. We might run on a totally different machine */ return 0; |