diff options
| author | Andy Green <andy.green@linaro.org> | 2011-04-13 12:47:50 +0100 |
|---|---|---|
| committer | Andy Green <andy.green@linaro.org> | 2011-04-13 12:47:50 +0100 |
| commit | 064606466ed75654bb0113810ff5de8fde2be24c (patch) | |
| tree | e5a85e17e2d8a940c7030b800720218dad4d6428 /arch/arm/mach-exynos4/gpiolib.c | |
| parent | af8cf92eb350fce3df47f58df576ba0458815984 (diff) | |
| parent | 7b4af25469a8a4b19feb2549777fed3120a4978f (diff) | |
Merge branch 'linux-linaro-2.6.38-master' into for-ubuntu
Diffstat (limited to 'arch/arm/mach-exynos4/gpiolib.c')
| -rw-r--r-- | arch/arm/mach-exynos4/gpiolib.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/arch/arm/mach-exynos4/gpiolib.c b/arch/arm/mach-exynos4/gpiolib.c index d54ca6adb66..3a47c8e84c9 100644 --- a/arch/arm/mach-exynos4/gpiolib.c +++ b/arch/arm/mach-exynos4/gpiolib.c @@ -23,14 +23,14 @@ static struct s3c_gpio_cfg gpio_cfg = { .set_config = s3c_gpio_setcfg_s3c64xx_4bit, - .set_pull = s3c_gpio_setpull_updown, - .get_pull = s3c_gpio_getpull_updown, + .set_pull = s3c_gpio_setpull_exynos4, + .get_pull = s3c_gpio_getpull_exynos4, }; static struct s3c_gpio_cfg gpio_cfg_noint = { .set_config = s3c_gpio_setcfg_s3c64xx_4bit, - .set_pull = s3c_gpio_setpull_updown, - .get_pull = s3c_gpio_getpull_updown, + .set_pull = s3c_gpio_setpull_exynos4, + .get_pull = s3c_gpio_getpull_exynos4, }; /* |