Techwizz/kernel-fxtec-pro1x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/linux-arm-soc

Browse source 
* '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
This commit is contained in:
Linus Torvalds 2011-07-29 23:31:22 -07:00
commit 49267fc82a
3 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
arch/arm/mach-tegra/Kconfig
View file

@ -27,14 +27,14 @@ comment "Tegra board type"
config MACH_HARMONY config MACH_HARMONY
bool "Harmony board" bool "Harmony board"
select MACH_HAS_SND_SOC_TEGRA_WM8903 select MACH_HAS_SND_SOC_TEGRA_WM8903 if SND_SOC
help help
Support for nVidia Harmony development platform Support for nVidia Harmony development platform
config MACH_KAEN config MACH_KAEN
bool "Kaen board" bool "Kaen board"
select MACH_SEABOARD select MACH_SEABOARD
select MACH_HAS_SND_SOC_TEGRA_WM8903 select MACH_HAS_SND_SOC_TEGRA_WM8903 if SND_SOC
help help
Support for the Kaen version of Seaboard Support for the Kaen version of Seaboard
@ -45,7 +45,7 @@ config MACH_PAZ00
config MACH_SEABOARD config MACH_SEABOARD
bool "Seaboard board" bool "Seaboard board"
select MACH_HAS_SND_SOC_TEGRA_WM8903 select MACH_HAS_SND_SOC_TEGRA_WM8903 if SND_SOC
help help
Support for nVidia Seaboard development platform. It will Support for nVidia Seaboard development platform. It will
also be included for some of the derivative boards that also be included for some of the derivative boards that

2
arch/arm/mach-zynq/Makefile
View file

@ -3,4 +3,4 @@
# #
# Common support # Common support
obj-y := common.o timer.o board_dt.o obj-y := common.o timer.o

0
arch/arm/mach-zynq/board_dt.c
View file