diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2015-05-29 15:00:02 +0200 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2015-05-29 15:00:02 +0200 |
| commit | 4fd8a5a5ac6bc042d9de8847e6b8e9182b9c566c (patch) | |
| tree | 03d2ae0b64f49f3a4d8185ef51f9d049781035fa | |
| parent | 499f164020786a721e96a114c2715e2c8e2a89d9 (diff) | |
| parent | 66f72f0c8e0d37339b6be1373c61d2a133c8b422 (diff) | |
| download | lwn-4fd8a5a5ac6bc042d9de8847e6b8e9182b9c566c.tar.gz lwn-4fd8a5a5ac6bc042d9de8847e6b8e9182b9c566c.zip | |
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
| -rw-r--r-- | arch/arm/mach-shmobile/Kconfig | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/mach-shmobile/Kconfig b/arch/arm/mach-shmobile/Kconfig index 0fb484221c90..45006479d461 100644 --- a/arch/arm/mach-shmobile/Kconfig +++ b/arch/arm/mach-shmobile/Kconfig @@ -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 |