diff options
| author | Ben Dooks <ben-linux@fluff.org> | 2009-05-21 17:10:21 -0400 |
|---|---|---|
| committer | Ben Dooks <ben-linux@fluff.org> | 2009-05-21 17:10:21 -0400 |
| commit | 99ae99533a059750c4b0f76295625b8ac5ea751a (patch) | |
| tree | 281129684e730ccd5b5b1e1fbbd9b83f3fa18986 /arch/arm/mach-s3c2400/gpio.c | |
| parent | bcb8a0d6f5e73c61a5290b4faaaa48dfa629e6b0 (diff) | |
| parent | 7a05a2cbd317cbd16e6d1689bb1e5e208eaaba6f (diff) | |
[ARM] S3C24XX: Merge devel-gpio
Merge branch 'devel-gpio' into for-rmk-devel
Diffstat (limited to 'arch/arm/mach-s3c2400/gpio.c')
| -rw-r--r-- | arch/arm/mach-s3c2400/gpio.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/arm/mach-s3c2400/gpio.c b/arch/arm/mach-s3c2400/gpio.c index 7a7ed4174c8c..6c68e78f3595 100644 --- a/arch/arm/mach-s3c2400/gpio.c +++ b/arch/arm/mach-s3c2400/gpio.c | |||
| @@ -33,10 +33,10 @@ | |||
| 33 | 33 | ||
| 34 | int s3c2400_gpio_getirq(unsigned int pin) | 34 | int s3c2400_gpio_getirq(unsigned int pin) |
| 35 | { | 35 | { |
| 36 | if (pin < S3C2410_GPE0 || pin > S3C2400_GPE7_EINT7) | 36 | if (pin < S3C2410_GPE(0) || pin > S3C2400_GPE(7)) |
| 37 | return -1; /* not valid interrupts */ | 37 | return -EINVAL; /* not valid interrupts */ |
| 38 | 38 | ||
| 39 | return (pin - S3C2410_GPE0) + IRQ_EINT0; | 39 | return (pin - S3C2410_GPE(0)) + IRQ_EINT0; |
| 40 | } | 40 | } |
| 41 | 41 | ||
| 42 | EXPORT_SYMBOL(s3c2400_gpio_getirq); | 42 | EXPORT_SYMBOL(s3c2400_gpio_getirq); |