diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-07-30 02:31:22 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-07-30 02:31:22 -0400 |
| commit | 49267fc82ad2825132be3b016d8eb58a90cb0c36 (patch) | |
| tree | 9a3bf3f8ddd18a3cea89fc5ed039b03a9bbf808e /arch/arm/mach-tegra/Kconfig | |
| parent | 2313bcdcc9ff1e42f51b200dc65ddaae14c347f4 (diff) | |
| parent | 18cb63b3f3ee4abd483544a664f0e720c7e5fd9f (diff) | |
Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/linux-arm-soc
* 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/linux-arm-soc:
ARM: zynq: remove incorrectly deleted file
ARM: tegra: only select MACH_HAS_SND_SOC_TEGRA_WM8903 if SND_SOC
Diffstat (limited to 'arch/arm/mach-tegra/Kconfig')
| -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 |