summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-omap2/board-omap3evm.c
diff options
context:
space:
mode:
authorTony Lindgren <tony@atomide.com>2012-07-10 08:22:24 +0200
committerTony Lindgren <tony@atomide.com>2012-07-10 08:22:24 +0200
commitb103a2e22a238085f5c50d96345e1a09bb1efd50 (patch)
tree264e7c676d1d291eaeb8f3f858c0dd7c21be2816 /arch/arm/mach-omap2/board-omap3evm.c
parentARM: OMAP: board-omap4panda: MUX configuration for sys_nirq2 (diff)
downloadlinux-b103a2e22a238085f5c50d96345e1a09bb1efd50.tar.xz
linux-b103a2e22a238085f5c50d96345e1a09bb1efd50.zip
ARM: OMAP3: Fix omap3evm randconfig error introduced by VBUS support
Commit cb8ca5897 (ARM: omap3evm: enable VBUS switch for EHCI tranceiver) added a new randconfig error if TWL4030_CORE is not selected: arch/arm/mach-omap2/board-omap3evm.c:368: undefined reference to `twl_i2c_read_u8' arch/arm/mach-omap2/board-omap3evm.c:370: undefined reference to `twl_i2c_write_u8' Signed-off-by: Tony Lindgren <tony@atomide.com>
Diffstat (limited to 'arch/arm/mach-omap2/board-omap3evm.c')
-rw-r--r--arch/arm/mach-omap2/board-omap3evm.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm/mach-omap2/board-omap3evm.c b/arch/arm/mach-omap2/board-omap3evm.c
index fdc00ca9a514..ef230a0eb5eb 100644
--- a/arch/arm/mach-omap2/board-omap3evm.c
+++ b/arch/arm/mach-omap2/board-omap3evm.c
@@ -362,6 +362,7 @@ static int omap3evm_twl_gpio_setup(struct device *dev,
/* Enable VBUS switch by setting TWL4030.GPIO2DIR as output
* for starting USB tranceiver
*/
+#ifdef CONFIG_TWL4030_CORE
if (get_omap3_evm_rev() >= OMAP3EVM_BOARD_GEN_2) {
u8 val;
@@ -369,6 +370,7 @@ static int omap3evm_twl_gpio_setup(struct device *dev,
val |= 0x04; /* TWL4030.GPIO2DIR BIT at GPIODATADIR1(0x9B) */
twl_i2c_write_u8(TWL4030_MODULE_GPIO, val, REG_GPIODATADIR1);
}
+#endif
return 0;
}