diff options
| author |   Linus Torvalds <torvalds@linux-foundation.org> | 2010-11-08 10:54:23 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-11-08 10:54:23 -0800 |
| commit | 934648f0449fae00946f55d64cd998bb5587fa1f (patch) | |
| tree | a8c5e55cfbfff34497f6ec873ea31725fdb849ab /arch/arm/mach-shmobile/include/mach/gpio.h | |
| parent | Merge branch 'sh-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6 (diff) | |
| parent | Merge branch 'rmobile/core' into rmobile-fixes-for-linus (diff) | |
| download | linux-dev-934648f0449fae00946f55d64cd998bb5587fa1f.tar.xz linux-dev-934648f0449fae00946f55d64cd998bb5587fa1f.zip | |
Merge branch 'rmobile-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6
* 'rmobile-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6:
mmc: sh_mmcif: Convert extern inline to static inline.
ARM: mach-shmobile: Allow GPIO chips to register IRQ mappings.
ARM: mach-shmobile: fix sh7372 after a recent clock framework rework
ARM: mach-shmobile: include drivers/sh/Kconfig
ARM: mach-shmobile: ap4evb: Add HDMI sound support
ARM: mach-shmobile: clock-sh7372: Add FSIDIV clock support
ARM: shmobile: remove sh_timer_config clk member
Diffstat (limited to 'arch/arm/mach-shmobile/include/mach/gpio.h')
| -rw-r--r-- | arch/arm/mach-shmobile/include/mach/gpio.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/mach-shmobile/include/mach/gpio.h b/arch/arm/mach-shmobile/include/mach/gpio.h index 5bc6bd444d72..2b1bb9e43dda 100644 --- a/arch/arm/mach-shmobile/include/mach/gpio.h +++ b/arch/arm/mach-shmobile/include/mach/gpio.h @@ -35,12 +35,12 @@ static inline int gpio_cansleep(unsigned gpio) static inline int gpio_to_irq(unsigned gpio) { - return -ENOSYS; + return __gpio_to_irq(gpio); } static inline int irq_to_gpio(unsigned int irq) { - return -EINVAL; + return -ENOSYS; } #endif /* CONFIG_GPIOLIB */ |