diff options
| author | Paul Mundt <lethal@linux-sh.org> | 2009-12-24 01:16:41 -0500 |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2009-12-24 01:16:41 -0500 |
| commit | 17eb9d62828c3688f41f31ac00d7fee6da9675bf (patch) | |
| tree | 03da91192242b6467d4f2d9d0b26f11f4da55c0c /arch/powerpc/include/asm/gpio.h | |
| parent | 76e7461a21dfe13565b2a323b53c8cc963541126 (diff) | |
| parent | f34548cb735b7a80bbbb0bdd09ad4c2173ba92d5 (diff) | |
Merge branches 'sh/g3-prep' and 'sh/stable-updates'
Diffstat (limited to 'arch/powerpc/include/asm/gpio.h')
| -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 ea04632399d8..38762edb5e58 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) |