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

Commit a9e3de6f authored by Mark Brown's avatar Mark Brown
Browse files

Merge branch 'tegra' into for-2.6.40 

Fix up merge with Harmony driver rename.

Conflicts:
	sound/soc/tegra/Kconfig
parents 97945c46 47912a65

arch/arm/mach-tegra/Kconfig

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

sound/soc/tegra/Kconfig

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