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

Commit 66f72f0c authored by Arnd Bergmann's avatar Arnd Bergmann Committed by Simon Horman
Browse files

ARM: shmobile: only select sound drivers that build 



A couple of codec drivers are selected by shmobile platform code,
but depend on I2C, which results in a build error:

sound/soc/codecs/ak4642.c:638:1: warning: data definition has no type or storage class
 module_i2c_driver(ak4642_i2c_driver);
 ^
sound/soc/codecs/ak4642.c:638:1: error: type defaults to 'int' in declaration of 'module_i2c_driver' [-Werror=implicit-int]
sound/soc/codecs/ak4642.c:638:1: warning: parameter names (without types) in function declaration
sound/soc/codecs/ak4642.c:627:26: warning: 'ak4642_i2c_driver' defined but not used [-Wunused-variable]

This ensures that we do not enable the respective drivers when I2C
is disabled.

Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
Acked-by: default avatarGeert Uytterhoeven <geert+renesas@glider.be>
Signed-off-by: default avatarSimon Horman <horms+renesas@verge.net.au>
parent b787f68c

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