diff options
| author | Olof Johansson <olof@lixom.net> | 2012-01-06 21:31:41 +0100 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2012-01-06 21:31:41 +0100 |
| commit | 65db039bf7402f0a5b19cbf6dcff55ebea433b8b (patch) | |
| tree | ccc18e9d71bb1b9dc1a69a2ba7ff18d8e376f7b3 /arch/arm/mach-s5pv210/mach-aquila.c | |
| parent | Merge branch 'next-samsung-cleanup-spi4' of git://git.kernel.org/pub/scm/linu... (diff) | |
| parent | ARM: EXYNOS: Use gpio_request_one (diff) | |
| download | linux-65db039bf7402f0a5b19cbf6dcff55ebea433b8b.tar.xz linux-65db039bf7402f0a5b19cbf6dcff55ebea433b8b.zip | |
Merge branch 'next-samsung-cleanup-samsung' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung into samsung/cleanup
Diffstat (limited to 'arch/arm/mach-s5pv210/mach-aquila.c')
| -rw-r--r-- | arch/arm/mach-s5pv210/mach-aquila.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/arch/arm/mach-s5pv210/mach-aquila.c b/arch/arm/mach-s5pv210/mach-aquila.c index 5811a96125f0..404ac7aec3c1 100644 --- a/arch/arm/mach-s5pv210/mach-aquila.c +++ b/arch/arm/mach-s5pv210/mach-aquila.c @@ -595,8 +595,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); |