iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'tegra' into for-2.6.40

Browse Source 
Fix up merge with Harmony driver rename.

Conflicts:
	sound/soc/tegra/Kconfig
This commit is contained in:
Mark Brown 2011-04-21 12:00:27 +01:00
commit a9e3de6f9f
2 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
arch/arm/mach-tegra/Kconfig
View File

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

9
sound/soc/tegra/Kconfig
View File

@ -14,10 +14,17 @@ config SND_SOC_TEGRA_I2S
Tegra I2S interface. You will also need to select the individual
machine drivers to support below.
config MACH_HAS_SND_SOC_TEGRA_WM8903
bool
help
Machines that use the SND_SOC_TEGRA_WM8903 driver should select
this config option, in order to allow the user to enable
SND_SOC_TEGRA_WM8903.
config SND_SOC_TEGRA_WM8903
tristate "SoC Audio support for Tegra boards using a WM8903 codec"
depends on SND_SOC_TEGRA && I2C
depends on MACH_HARMONY || MACH_VENTANA || MACH_SEABOARD || MACH_KAEN || MACH_AEBL
depends on MACH_HAS_SND_SOC_TEGRA_WM8903
default m
select SND_SOC_TEGRA_I2S
select SND_SOC_WM8903