]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commitdiff
[media] arm: omap2: rx51-peripherals: fix build warning
authorFelipe Balbi <balbi@ti.com>
Wed, 26 Nov 2014 20:27:35 +0000 (17:27 -0300)
committerMauro Carvalho Chehab <mchehab@osg.samsung.com>
Thu, 4 Dec 2014 17:28:50 +0000 (15:28 -0200)
commit 68a3c0433077 ([media] ARM: OMAP2: RX-51: update
si4713 platform data) updated board-rx51-peripherals.c
so that si4713 could be easily used on DT boot, but
it ended up introducing a build warning whenever
si4713 isn't enabled.

This patches fixes that warning:

arch/arm/mach-omap2/board-rx51-peripherals.c:1000:36: warning: \
‘rx51_si4713_platform_data’ defined but not used [-Wunused-variable]
 static struct si4713_platform_data rx51_si4713_platform_data = {

Cc: Sebastian Reichel <sre@kernel.org>
Cc: Tony Lindgren <tony@atomide.com>
Cc: Hans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: Felipe Balbi <balbi@ti.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@osg.samsung.com>
arch/arm/mach-omap2/board-rx51-peripherals.c

index ec2e4101988b921acef873860a1d16a9dcffeb52..2fd63fb98e7dca4644b866e6968146f65e81d6b5 100644 (file)
@@ -1000,9 +1000,11 @@ static struct aic3x_pdata rx51_aic3x_data2 = {
        .gpio_reset = 60,
 };
 
+#if IS_ENABLED(CONFIG_I2C_SI4713) && IS_ENABLED(CONFIG_PLATFORM_SI4713)
 static struct si4713_platform_data rx51_si4713_platform_data = {
        .is_platform_device = true
 };
+#endif
 
 static struct i2c_board_info __initdata rx51_peripherals_i2c_board_info_2[] = {
 #if IS_ENABLED(CONFIG_I2C_SI4713) && IS_ENABLED(CONFIG_PLATFORM_SI4713)