diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2011-03-01 11:52:39 +1100 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2011-03-01 11:52:39 +1100 |
| commit | 713298b18b1627a810d4165d0fe4d0c7a6fe34d9 (patch) | |
| tree | 110339949d063d25e755708aeaaaf25991c695a4 /sound | |
| parent | a49862059e4d1d8f6b8b8b56b9db6c3cd80455d6 (diff) | |
| parent | c305bbdf1b926f1dc0ed4558241802a9ff4e1d59 (diff) | |
Merge remote-tracking branch 'i.MX/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 1e9bccae4e80..75fb4b83548b 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; |