From 885f24e152d2b85569d33a1679cf47db56172b9c Mon Sep 17 00:00:00 2001 From: Uwe Kleine-König Date: Tue, 26 Jul 2011 10:15:59 +0200 Subject: 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 Acked-by: Stephen Warren Acked-By: Colin Cross Signed-off-by: Arnd Bergmann --- arch/arm/mach-tegra/Kconfig | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'arch/arm') 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" config MACH_HARMONY bool "Harmony board" - select MACH_HAS_SND_SOC_TEGRA_WM8903 + select MACH_HAS_SND_SOC_TEGRA_WM8903 if SND_SOC help Support for nVidia Harmony development platform config MACH_KAEN bool "Kaen board" select MACH_SEABOARD - select MACH_HAS_SND_SOC_TEGRA_WM8903 + select MACH_HAS_SND_SOC_TEGRA_WM8903 if SND_SOC help Support for the Kaen version of Seaboard @@ -45,7 +45,7 @@ config MACH_PAZ00 config MACH_SEABOARD bool "Seaboard board" - select MACH_HAS_SND_SOC_TEGRA_WM8903 + select MACH_HAS_SND_SOC_TEGRA_WM8903 if SND_SOC help Support for nVidia Seaboard development platform. It will also be included for some of the derivative boards that -- cgit v1.2.3 From 18cb63b3f3ee4abd483544a664f0e720c7e5fd9f Mon Sep 17 00:00:00 2001 From: Arnd Bergmann Date: Thu, 28 Jul 2011 14:33:40 +0000 Subject: ARM: zynq: remove incorrectly deleted file My previous commit left the file empty and present in the Makefile, which is a bit dirty and caused problems with 'make distclean', as pointed out by David Howells. This hopefully cleans it up the right way. Signed-off-by: Arnd Bergmann Acked-by: David Howells Acked-by: John Linn --- arch/arm/mach-zynq/Makefile | 2 +- arch/arm/mach-zynq/board_dt.c | 0 2 files changed, 1 insertion(+), 1 deletion(-) delete mode 100644 arch/arm/mach-zynq/board_dt.c (limited to 'arch/arm') diff --git a/arch/arm/mach-zynq/Makefile b/arch/arm/mach-zynq/Makefile index c550c67aa893..397268c1b250 100644 --- a/arch/arm/mach-zynq/Makefile +++ b/arch/arm/mach-zynq/Makefile @@ -3,4 +3,4 @@ # # Common support -obj-y := common.o timer.o board_dt.o +obj-y := common.o timer.o diff --git a/arch/arm/mach-zynq/board_dt.c b/arch/arm/mach-zynq/board_dt.c deleted file mode 100644 index e69de29bb2d1..000000000000 -- cgit v1.2.3