diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-12-07 17:13:50 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-12-07 17:13:50 -0800 |
| commit | 2cedcc4f122934c3ad38dfb2a400b98a62703e6d (patch) | |
| tree | dffa5daaf84cc7cd1a7e966ce4c6885e4dd974b9 /arch/arm/plat-s3c24xx/gpiolib.c | |
| parent | 6142e05f30b101adeafb0d12e35983f44f68233e (diff) | |
| parent | 812c4e40c27b6ea103ecfbf91d43654356629b81 (diff) | |
Merge branch 'fixes/2637-rc5/s3c24xx' of git://git.fluff.org/bjdooks/linux
* 'fixes/2637-rc5/s3c24xx' of git://git.fluff.org/bjdooks/linux:
ARM: S3C24XX: Fix mess with gpio {set,get}_pull callbacks
ARM: mini2440: Fix Kconfig to allow kernel to build
ARM: S3C2412: Fix typo in CONFIG_CPU_S3C2412_ONLY definition
ARM: S3C2443: Select properly ARM core type
ARM: SMDK2416: Select MACH_SMDK, S3C_DEV_NAND, S3C_DEV_USB_HOST
Diffstat (limited to 'arch/arm/plat-s3c24xx/gpiolib.c')
| -rw-r--r-- | arch/arm/plat-s3c24xx/gpiolib.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/arch/arm/plat-s3c24xx/gpiolib.c b/arch/arm/plat-s3c24xx/gpiolib.c index 24c6f5a3059..243b6411050 100644 --- a/arch/arm/plat-s3c24xx/gpiolib.c +++ b/arch/arm/plat-s3c24xx/gpiolib.c @@ -82,8 +82,6 @@ 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[] = { |