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

Commit 4fd8a5a5 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'renesas-soc-for-v4.2' of... 

Merge tag 'renesas-soc-for-v4.2' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas into next/soc

Merge "Renesas ARM Based SoC Updates for v4.2" from Simon Horman:

* Only select sound drivers that build

* tag 'renesas-soc-for-v4.2' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas:
  ARM: shmobile: only select sound drivers that build
parents 499f1640 66f72f0c

arch/arm/mach-shmobile/Kconfig

+2 −2
Original line number Diff line number Diff line
@@ -139,7 +139,7 @@ config MACH_ARMADILLO800EVA 
	select ARCH_REQUIRE_GPIOLIB

	select REGULATOR_FIXED_VOLTAGE if REGULATOR

	select SMSC_PHY if SH_ETH

	select SND_SOC_WM8978 if SND_SIMPLE_CARD

	select SND_SOC_WM8978 if SND_SIMPLE_CARD && I2C

	select USE_OF



config MACH_BOCKW
@@ -148,7 +148,7 @@ config MACH_BOCKW 
	select ARCH_REQUIRE_GPIOLIB

	select REGULATOR_FIXED_VOLTAGE if REGULATOR

	select SND_SOC_AK4554 if SND_SIMPLE_CARD

	select SND_SOC_AK4642 if SND_SIMPLE_CARD

	select SND_SOC_AK4642 if SND_SIMPLE_CARD && I2C

	select USE_OF



config MACH_BOCKW_REFERENCE