diff options
author | Uwe Kleine-König <u.kleine-koenig@pengutronix.de> | 2011-07-26 04:15:59 -0400 |
---|---|---|
committer | Arnd Bergmann <arnd@arndb.de> | 2011-07-27 11:13:40 -0400 |
commit | 885f24e152d2b85569d33a1679cf47db56172b9c (patch) | |
tree | 7e6a102811eaadc47d8e9b0312da6948f7474778 /arch/arm | |
parent | e371d46ae45488bcb112a99a7de462e9e3aa6764 (diff) |
ARM: tegra: only select MACH_HAS_SND_SOC_TEGRA_WM8903 if SND_SOC
This fixes:
warning: (MACH_HARMONY && MACH_KAEN && MACH_SEABOARD) selects MACH_HAS_SND_SOC_TEGRA_WM8903 which has unmet direct dependencies (SOUND && !M68K && SND && SND_SOC)
Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
Acked-by: Stephen Warren <swarren@nvidia.com>
Acked-By: Colin Cross <ccross@android.com>
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'arch/arm')
-rw-r--r-- | arch/arm/mach-tegra/Kconfig | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/arm/mach-tegra/Kconfig b/arch/arm/mach-tegra/Kconfig index 5ec1846aa1d0..fec64f3aa68e 100644 --- a/arch/arm/mach-tegra/Kconfig +++ b/arch/arm/mach-tegra/Kconfig | |||
@@ -27,14 +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 | select MACH_HAS_SND_SOC_TEGRA_WM8903 if SND_SOC |
31 | help | 31 | help |
32 | Support for nVidia Harmony development platform | 32 | Support for nVidia Harmony development platform |
33 | 33 | ||
34 | config MACH_KAEN | 34 | config MACH_KAEN |
35 | bool "Kaen board" | 35 | bool "Kaen board" |
36 | select MACH_SEABOARD | 36 | select MACH_SEABOARD |
37 | select MACH_HAS_SND_SOC_TEGRA_WM8903 | 37 | select MACH_HAS_SND_SOC_TEGRA_WM8903 if SND_SOC |
38 | help | 38 | help |
39 | Support for the Kaen version of Seaboard | 39 | Support for the Kaen version of Seaboard |
40 | 40 | ||
@@ -45,7 +45,7 @@ config MACH_PAZ00 | |||
45 | 45 | ||
46 | config MACH_SEABOARD | 46 | config MACH_SEABOARD |
47 | bool "Seaboard board" | 47 | bool "Seaboard board" |
48 | select MACH_HAS_SND_SOC_TEGRA_WM8903 | 48 | select MACH_HAS_SND_SOC_TEGRA_WM8903 if SND_SOC |
49 | help | 49 | help |
50 | Support for nVidia Seaboard development platform. It will | 50 | Support for nVidia Seaboard development platform. It will |
51 | also be included for some of the derivative boards that | 51 | also be included for some of the derivative boards that |