diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-04-21 11:00:27 (GMT) |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-04-21 11:00:27 (GMT) |
| commit | a9e3de6f9f4f3c9deb409d06fa4f4cfbe9878843 (patch) | |
| tree | 41dd8005dbeb839c9c92c1ab310e160f405c47df /arch | |
| parent | 97945c46a23de5f9dfedf1b4a33e51d074df9a9c (diff) | |
| parent | 47912a657ec2aa52c7af5f5e2ecc4efe41094d44 (diff) | |
| download | linux-a9e3de6f9f4f3c9deb409d06fa4f4cfbe9878843.tar.xz | |
Merge branch 'tegra' into for-2.6.40
Fix up merge with Harmony driver rename.
Conflicts:
sound/soc/tegra/Kconfig
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/mach-tegra/Kconfig | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/arm/mach-tegra/Kconfig b/arch/arm/mach-tegra/Kconfig index 3cdeffc..5ec1846 100644 --- a/arch/arm/mach-tegra/Kconfig +++ b/arch/arm/mach-tegra/Kconfig @@ -27,12 +27,14 @@ comment "Tegra board type" config MACH_HARMONY bool "Harmony board" + select MACH_HAS_SND_SOC_TEGRA_WM8903 help Support for nVidia Harmony development platform config MACH_KAEN bool "Kaen board" select MACH_SEABOARD + select MACH_HAS_SND_SOC_TEGRA_WM8903 help Support for the Kaen version of Seaboard @@ -43,6 +45,7 @@ config MACH_PAZ00 config MACH_SEABOARD bool "Seaboard board" + select MACH_HAS_SND_SOC_TEGRA_WM8903 help Support for nVidia Seaboard development platform. It will also be included for some of the derivative boards that |