diff options
author | Ingo Molnar <mingo@elte.hu> | 2009-05-12 06:17:30 -0400 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2009-05-12 06:17:36 -0400 |
commit | 6cda3eb62ef42aa5acd649bf99c8db544e0f4051 (patch) | |
tree | 93f74ca002f5756c8e157611174f9540b5cf41c0 /arch/arm/mach-omap1/board-h3-mmc.c | |
parent | b9c61b70075c87a8612624736faf4a2de5b1ed30 (diff) | |
parent | cec6be6d1069d697beb490bbb40a290d5ff554a2 (diff) |
Merge branch 'x86/apic' into irq/numa
Merge reason: both topics modify the APIC code but were able to do it in
parallel so far. An upcoming patch generates a conflict so
merge them to avoid the conflict.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/arm/mach-omap1/board-h3-mmc.c')
-rw-r--r-- | arch/arm/mach-omap1/board-h3-mmc.c | 6 |
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 @@ | |||
26 | static int mmc_set_power(struct device *dev, int slot, int power_on, | 26 | static int mmc_set_power(struct device *dev, int slot, int power_on, |
27 | int vdd) | 27 | int vdd) |
28 | { | 28 | { |
29 | if (power_on) | 29 | gpio_set_value(H3_TPS_GPIO_MMC_PWR_EN, power_on); |
30 | gpio_direction_output(H3_TPS_GPIO_MMC_PWR_EN, 1); | ||
31 | else | ||
32 | gpio_direction_output(H3_TPS_GPIO_MMC_PWR_EN, 0); | ||
33 | |||
34 | return 0; | 30 | return 0; |
35 | } | 31 | } |
36 | 32 | ||