diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-10-28 20:39:13 +0100 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-10-28 20:39:13 +0100 |
| commit | 9bafc74163d8bccca9810159aab39be926fb877c (patch) | |
| tree | baa3ba406135247eeb9cdf495448b5db8eea2f0b /arch/arm/mach-s3c64xx/gpiolib.c | |
| parent | 8df6516864462cb7a6f87d5a46df68fb0faebbb5 (diff) | |
| parent | b3773301c4290f054aa2aa5379e59a1bf4f78bdf (diff) | |
| download | linux-9bafc74163d8bccca9810159aab39be926fb877c.tar.gz linux-9bafc74163d8bccca9810159aab39be926fb877c.tar.bz2 linux-9bafc74163d8bccca9810159aab39be926fb877c.zip | |
Merge branch 'devel-stable' into devel
Diffstat (limited to 'arch/arm/mach-s3c64xx/gpiolib.c')
| -rw-r--r-- | arch/arm/mach-s3c64xx/gpiolib.c | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/arch/arm/mach-s3c64xx/gpiolib.c b/arch/arm/mach-s3c64xx/gpiolib.c index 300dee4a667b..fd99a82e82c4 100644 --- a/arch/arm/mach-s3c64xx/gpiolib.c +++ b/arch/arm/mach-s3c64xx/gpiolib.c @@ -195,11 +195,6 @@ static struct s3c_gpio_cfg gpio_2bit_cfg_eint11 = { .get_pull = s3c_gpio_getpull_updown, }; -int s3c64xx_gpio2int_gpn(struct gpio_chip *chip, unsigned pin) -{ - return IRQ_EINT(0) + pin; -} - static struct s3c_gpio_chip gpio_2bit[] = { { .base = S3C64XX_GPF_BASE, @@ -227,12 +222,13 @@ static struct s3c_gpio_chip gpio_2bit[] = { }, }, { .base = S3C64XX_GPN_BASE, + .irq_base = IRQ_EINT(0), .config = &gpio_2bit_cfg_eint10, .chip = { .base = S3C64XX_GPN(0), .ngpio = S3C64XX_GPIO_N_NR, .label = "GPN", - .to_irq = s3c64xx_gpio2int_gpn, + .to_irq = samsung_gpiolib_to_irq, }, }, { .base = S3C64XX_GPO_BASE, |