diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-04-21 07:00:27 -0400 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-04-21 07:00:27 -0400 |
| commit | a9e3de6f9f4f3c9deb409d06fa4f4cfbe9878843 (patch) | |
| tree | 41dd8005dbeb839c9c92c1ab310e160f405c47df /arch | |
| parent | 97945c46a23de5f9dfedf1b4a33e51d074df9a9c (diff) | |
| parent | 47912a657ec2aa52c7af5f5e2ecc4efe41094d44 (diff) | |
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 3cdeffc97b44..5ec1846aa1d0 100644 --- a/arch/arm/mach-tegra/Kconfig +++ b/arch/arm/mach-tegra/Kconfig | |||
| @@ -27,12 +27,14 @@ comment "Tegra board type" | |||
| 27 | 27 | ||
| 28 | config MACH_HARMONY | 28 | config MACH_HARMONY |
| 29 | bool "Harmony board" | 29 | bool "Harmony board" |
| 30 | select MACH_HAS_SND_SOC_TEGRA_WM8903 | ||
| 30 | help | 31 | help |
| 31 | Support for nVidia Harmony development platform | 32 | Support for nVidia Harmony development platform |
| 32 | 33 | ||
| 33 | config MACH_KAEN | 34 | config MACH_KAEN |
| 34 | bool "Kaen board" | 35 | bool "Kaen board" |
| 35 | select MACH_SEABOARD | 36 | select MACH_SEABOARD |
| 37 | select MACH_HAS_SND_SOC_TEGRA_WM8903 | ||
| 36 | help | 38 | help |
| 37 | Support for the Kaen version of Seaboard | 39 | Support for the Kaen version of Seaboard |
| 38 | 40 | ||
| @@ -43,6 +45,7 @@ config MACH_PAZ00 | |||
| 43 | 45 | ||
| 44 | config MACH_SEABOARD | 46 | config MACH_SEABOARD |
| 45 | bool "Seaboard board" | 47 | bool "Seaboard board" |
| 48 | select MACH_HAS_SND_SOC_TEGRA_WM8903 | ||
| 46 | help | 49 | help |
| 47 | Support for nVidia Seaboard development platform. It will | 50 | Support for nVidia Seaboard development platform. It will |
| 48 | also be included for some of the derivative boards that | 51 | also be included for some of the derivative boards that |