aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-s5pv210
diff options
context:
space:
mode:
authorPawit Pornkitprasan <p.pawit@gmail.com>2012-01-15 08:04:01 +0700
committerPawit Pornkitprasan <p.pawit@gmail.com>2012-01-15 09:28:01 +0700
commit427e7a6f446ff8cceb18a6829fcbdf45589d3b13 (patch)
tree1b33891492727577b846465647c185860e0e15e8 /arch/arm/mach-s5pv210
parent7ed8be7bd1a337820e32a9b184a33b1cdb9d419c (diff)
downloadkernel_samsung_aries-427e7a6f446ff8cceb18a6829fcbdf45589d3b13.tar.gz
kernel_samsung_aries-427e7a6f446ff8cceb18a6829fcbdf45589d3b13.tar.bz2
kernel_samsung_aries-427e7a6f446ff8cceb18a6829fcbdf45589d3b13.zip
aries: Remove mass storage gpio setting not found in the original kernel
Diffstat (limited to 'arch/arm/mach-s5pv210')
-rw-r--r--arch/arm/mach-s5pv210/setup-sdhci-gpio.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-s5pv210/setup-sdhci-gpio.c b/arch/arm/mach-s5pv210/setup-sdhci-gpio.c
index b7f80900753..1de61e3cc52 100644
--- a/arch/arm/mach-s5pv210/setup-sdhci-gpio.c
+++ b/arch/arm/mach-s5pv210/setup-sdhci-gpio.c
@@ -67,7 +67,7 @@ void s5pv210_setup_sdhci0_cfg_gpio(struct platform_device *dev, int width)
gpio_set_value(S5PV210_GPJ2(7), 1);
}
- if (machine_is_herring() || machine_is_aries()) {
+ if (machine_is_herring()) { // This is not done for aries in the original kernel
gpio_direction_output(S5PV210_GPJ2(7), 1);
s3c_gpio_setpull(S5PV210_GPJ2(7), S3C_GPIO_PULL_NONE);
}