Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 49267fc8 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents 2313bcdc 18cb63b3

arch/arm/mach-tegra/Kconfig

+3 −3
Original line number Diff line number Diff line
@@ -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

arch/arm/mach-zynq/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -3,4 +3,4 @@ 
#



# Common support

obj-y 				:= common.o timer.o board_dt.o
 
obj-y				:= common.o timer.o

arch/arm/mach-zynq/board_dt.c

deleted100644 → 0
+0 −0

Empty file deleted.