summaryrefslogtreecommitdiff
path: root/arch/powerpc/include/asm
diff options
context:
space:
mode:
authorBenjamin Herrenschmidt <benh@kernel.crashing.org>2009-12-21 09:30:42 +1100
committerBenjamin Herrenschmidt <benh@kernel.crashing.org>2009-12-21 09:30:42 +1100
commit2593f939a5fa7564ba5be0fd5aec4bb1162bd4b2 (patch)
treee605e977dfb7a03b89ee85ffb643e8645a6752ac /arch/powerpc/include/asm
parent698cd335a782561b79504d4e98c7df62b08e7abd (diff)
parentc1a676dfa2fa25fb9ec77c92ebe3ff580648b6ac (diff)
Merge commit 'kumar/next' into merge
Diffstat (limited to 'arch/powerpc/include/asm')
-rw-r--r--arch/powerpc/include/asm/gpio.h5
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)
return __gpio_cansleep(gpio);
}
-/*
- * Not implemented, yet.
- */
static inline int gpio_to_irq(unsigned int gpio)
{
- return -ENOSYS;
+ return __gpio_to_irq(gpio);
}
static inline int irq_to_gpio(unsigned int irq)