summaryrefslogtreecommitdiffstats
path: root/arch/arm/plat-s3c24xx
diff options
context:
space:
mode:
authorBen Dooks <ben-linux@fluff.org>2010-10-30 00:46:55 +0100
committerBen Dooks <ben-linux@fluff.org>2010-10-30 00:46:55 +0100
commitd7b4e421a5be88f2f5b3cfe9aec638d90c62bc0f (patch)
treed18aa2e45a3175cd65c7d552cb94e50ff46cd7a4 /arch/arm/plat-s3c24xx
parent7c1552d196682f05abaa8e49f81c40a9b6459b67 (diff)
parentbdf5005b738c1542a30b41a83069329313fc61f6 (diff)
downloadblackbird-op-linux-d7b4e421a5be88f2f5b3cfe9aec638d90c62bc0f.tar.gz
blackbird-op-linux-d7b4e421a5be88f2f5b3cfe9aec638d90c62bc0f.zip
ARM: Merge for-2637/s3c24xx/misc
Diffstat (limited to 'arch/arm/plat-s3c24xx')
-rw-r--r--arch/arm/plat-s3c24xx/gpiolib.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm/plat-s3c24xx/gpiolib.c b/arch/arm/plat-s3c24xx/gpiolib.c
index 4c0896f2572d..ae9d3c2403f0 100644
--- a/arch/arm/plat-s3c24xx/gpiolib.c
+++ b/arch/arm/plat-s3c24xx/gpiolib.c
@@ -87,6 +87,8 @@ static struct s3c_gpio_cfg s3c24xx_gpiocfg_banka = {
struct s3c_gpio_cfg s3c24xx_gpiocfg_default = {
.set_config = s3c_gpio_setcfg_s3c24xx,
.get_config = s3c_gpio_getcfg_s3c24xx,
+ .set_pull = s3c_gpio_setpull_1up,
+ .get_pull = s3c_gpio_getpull_1up,
};
struct s3c_gpio_chip s3c24xx_gpios[] = {
OpenPOWER on IntegriCloud