diff options
author | Takashi Iwai <tiwai@suse.de> | 2009-05-29 05:46:10 -0400 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2009-05-29 05:46:10 -0400 |
commit | e93721a70263afefbac781f575bfe851c6f95d84 (patch) | |
tree | ab359f12a0688802aa99339bae82c51763dae9f6 /arch/arm/mach-omap1/board-h3-mmc.c | |
parent | ae1ec5e1e97f67d41e641a73380129e5905e41cc (diff) | |
parent | c87d9732004b3f8fd82d729f12ccfb96c0df279e (diff) |
Merge branch 'fix/pcm-jiffies-check' into topic/pcm-jiffies-check
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 | ||