diff --git a/[refs] b/[refs]
index 0b6990ce671b..b6b7efc643ef 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6d2b6c9e69c99c1787f9978f9ed89231c5dbef09
+refs/heads/master: b103a2e22a238085f5c50d96345e1a09bb1efd50
diff --git a/trunk/arch/arm/mach-omap2/board-omap3evm.c b/trunk/arch/arm/mach-omap2/board-omap3evm.c
index fdc00ca9a514..ef230a0eb5eb 100644
--- a/trunk/arch/arm/mach-omap2/board-omap3evm.c
+++ b/trunk/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;
 }