diff options
| author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2009-12-20 17:30:42 -0500 |
|---|---|---|
| committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2009-12-20 17:30:42 -0500 |
| commit | 2593f939a5fa7564ba5be0fd5aec4bb1162bd4b2 (patch) | |
| tree | e605e977dfb7a03b89ee85ffb643e8645a6752ac /arch/powerpc/include | |
| parent | 698cd335a782561b79504d4e98c7df62b08e7abd (diff) | |
| parent | c1a676dfa2fa25fb9ec77c92ebe3ff580648b6ac (diff) | |
Merge commit 'kumar/next' into merge
Diffstat (limited to 'arch/powerpc/include')
| -rw-r--r-- | arch/powerpc/include/asm/gpio.h | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/arch/powerpc/include/asm/gpio.h b/arch/powerpc/include/asm/gpio.h index ea04632399d..38762edb5e5 100644 --- a/arch/powerpc/include/asm/gpio.h +++ b/arch/powerpc/include/asm/gpio.h | |||
| @@ -38,12 +38,9 @@ static inline int gpio_cansleep(unsigned int gpio) | |||
| 38 | return __gpio_cansleep(gpio); | 38 | return __gpio_cansleep(gpio); |
| 39 | } | 39 | } |
| 40 | 40 | ||
| 41 | /* | ||
| 42 | * Not implemented, yet. | ||
| 43 | */ | ||
| 44 | static inline int gpio_to_irq(unsigned int gpio) | 41 | static inline int gpio_to_irq(unsigned int gpio) |
| 45 | { | 42 | { |
| 46 | return -ENOSYS; | 43 | return __gpio_to_irq(gpio); |
| 47 | } | 44 | } |
| 48 | 45 | ||
| 49 | static inline int irq_to_gpio(unsigned int irq) | 46 | static inline int irq_to_gpio(unsigned int irq) |