summaryrefslogtreecommitdiff
path: root/arch/arm/mach-mxs/mach-mx23evk.c
diff options
context:
space:
mode:
authorRussell King <rmk+kernel@arm.linux.org.uk>2011-05-20 10:38:27 +0100
committerRussell King <rmk+kernel@arm.linux.org.uk>2011-05-20 10:38:27 +0100
commitc721be2807467819d16db4d61a4c5db539bcc1c7 (patch)
treeee166b44ad37480d3f05b6a0930bd69e16c6fbf9 /arch/arm/mach-mxs/mach-mx23evk.c
parent1e87347c2f6e124d73b4921c4580adad4ac534d6 (diff)
parent27ad4bf72a27c80c121b2349174e6b41b2e3afd8 (diff)
Merge branch 'for-rmk' of git://git.pengutronix.de/git/imx/linux-2.6 into devel-stable
Diffstat (limited to 'arch/arm/mach-mxs/mach-mx23evk.c')
-rw-r--r--arch/arm/mach-mxs/mach-mx23evk.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-mxs/mach-mx23evk.c b/arch/arm/mach-mxs/mach-mx23evk.c
index 214e5b641bbc..3c2de33803ab 100644
--- a/arch/arm/mach-mxs/mach-mx23evk.c
+++ b/arch/arm/mach-mxs/mach-mx23evk.c
@@ -148,7 +148,7 @@ static void __init mx23evk_init(void)
mx23_add_auart0();
/* power on mmc slot by writing 0 to the gpio */
- ret = gpio_request_one(MX23EVK_MMC0_SLOT_POWER, GPIOF_DIR_OUT,
+ ret = gpio_request_one(MX23EVK_MMC0_SLOT_POWER, GPIOF_OUT_INIT_LOW,
"mmc0-slot-power");
if (ret)
pr_warn("failed to request gpio mmc0-slot-power: %d\n", ret);