projects
/
linux-2.6-block.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'devel' of master.kernel.org:/home/rmk/linux-2.6-arm
[linux-2.6-block.git]
/
arch
/
arm
/
plat-s3c24xx
/
gpiolib.c
diff --git
a/arch/arm/plat-s3c24xx/gpiolib.c
b/arch/arm/plat-s3c24xx/gpiolib.c
index 243b6411050d5edfdd587535a65173f9b1343aa7..24c6f5a30596b3d8206ab16d711ab202e5d99ad8 100644
(file)
--- a/
arch/arm/plat-s3c24xx/gpiolib.c
+++ b/
arch/arm/plat-s3c24xx/gpiolib.c
@@
-82,6
+82,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[] = {