diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2011-02-28 11:01:09 +0100 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2011-02-28 11:01:09 +0100 |
| commit | c305bbdf1b926f1dc0ed4558241802a9ff4e1d59 (patch) | |
| tree | bd38456c5dc63493f839dc3229117d8d53b3a115 /sound | |
| parent | 8493d891a72a9c7983d6fa3c4bb3f84dfffb589b (diff) | |
| parent | bdbc974641874e8c87d6a09fc923f1bed6ceaabf (diff) | |
Merge branch 'imx-for-2.6.39' into for-next
Diffstat (limited to 'sound')
| -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; |