Merge branch 'linus' into tracing/core

Merge reason: tracing/core was on a .30-rc1 base and was missing out on
              on a handful of tracing fixes present in .30-rc5-almost.

Signed-off-by: Ingo Molnar <mingo@elte.hu>

1 files changed, 1 insertions, 5 deletions

diff --git a/arch/arm/mach-omap1/board-h3-mmc.c b/arch/arm/mach-omap1/board-h3-mmc.c
index 0d8a3c195e2e..5e8877ce35e0 100644
--- a/arch/arm/mach-omap1/board-h3-mmc.c
+++ b/arch/arm/mach-omap1/board-h3-mmc.c
@@ -26,11 +26,7 @@
 static int mmc_set_power(struct device *dev, int slot, int power_on,
                                 int vdd)
 {
-        if (power_on)
-                gpio_direction_output(H3_TPS_GPIO_MMC_PWR_EN, 1);
-        else
-                gpio_direction_output(H3_TPS_GPIO_MMC_PWR_EN, 0);
-
+        gpio_set_value(H3_TPS_GPIO_MMC_PWR_EN, power_on);
         return 0;
 }