Merge branch 'samsung/dt' into samsung/cleanup

[karo-tx-linux.git] / arch / arm / mach-s5pv210 / mach-aquila.c

diff --git a/arch/arm/mach-s5pv210/mach-aquila.c b/arch/arm/mach-s5pv210/mach-aquila.c
index 6f7dfe993c127baaa8204015fd4b7ee16676df84..5e734d025a6a2c0926a292e2ce2f0f400f866e67 100644 (file)
--- a/arch/arm/mach-s5pv210/mach-aquila.c
+++ b/arch/arm/mach-s5pv210/mach-aquila.c
@@ -597,8 +597,7 @@ static struct s3c_sdhci_platdata aquila_hsmmc2_data __initdata = {
 
 static void aquila_setup_sdhci(void)
 {
-       gpio_request(AQUILA_EXT_FLASH_EN, "FLASH_EN");
-       gpio_direction_output(AQUILA_EXT_FLASH_EN, 1);
+       gpio_request_one(AQUILA_EXT_FLASH_EN, GPIOF_OUT_INIT_HIGH, "FLASH_EN");
 
        s3c_sdhci0_set_platdata(&aquila_hsmmc0_data);
        s3c_sdhci1_set_platdata(&aquila_hsmmc1_data);