Renesas ARM Based SoC Updates for v4.2

* Only select sound drivers that build
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1
 
 iQIcBAABAgAGBQJVZmTHAAoJENfPZGlqN0++uGgP/As6AJQc5PsPSwwuXBpEsQyR
 YHg1VTwG1YYNov9h9lWvQkBm+D+zpjq2THIgY77gWUYU+yHxAr6T6vBU5hrMCYfX
 fmuSCsIiwoFSOHnANfiqpx0fT3jJ16uml7w+ObsapstROGVa1yKiYUyo8+dSbpi8
 AysqmWWzGarBp30aKQBLvDv8VQfaxOW4QbBTqpvboMSP1775RyXt0lK52he1AKlo
 NYlEfsIzrpGNbt9chFPsBpB5a8xnhx27ovDV0kdmGoHvxm8tioAMxJA5ptv809uP
 /BhRK9wXg6PjMiW4CtTOmTb6wy5aaAe+Jie2S6C7XfyMW6iyuPIB3VjilNVOFA/w
 Xr25JIGwmndZM7wJ0/nBV/hHzijX/gA0A8ifyeHjFUPNTcHxuIDtecI4WaqM5gvX
 D/uf0vd939nlhsLz685HVt+u9j0fc8zCO3upq+U2w0+M51H6A1PPz2IHW9O39Y8t
 6g2eZo1nY/MG0NMDQT70RrNLDI7NvVSS0HpUKHIm/u1MsN7/HX1oDOZYC9NBz0wA
 q0V99K5mViskNWvmjCH9kUWv5NQYBnEw2nl+fCfPLbp5zFotprFVgCC98i/LyD4v
 mC3Vsnwaxa/9oe71q4y9wXHO/9YrkyxlXy6OuFSNbvvFsdcgtU1Tj2KjelDztiYX
 128WAjsSL94OJ1JnbtKy
 =nfP3
 -----END PGP SIGNATURE-----

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
This commit is contained in:
Arnd Bergmann 2015-05-29 15:00:02 +02:00
Родитель 499f164020 66f72f0c8e
Коммит 4fd8a5a5ac
1 изменённых файлов: 2 добавлений и 2 удалений

Просмотреть файл

@ -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