aboutsummaryrefslogtreecommitdiff
path: root/include/asm-arm
diff options
context:
space:
mode:
authorAndy Green <andy@openmoko.com>2008-11-19 17:09:41 +0000
committerAndy Green <agreen@pads.home.warmcat.com>2008-11-19 17:09:41 +0000
commitbb03ed11f1fafb8dd45f89dad99355aa96542d6a (patch)
tree91a6e20524db719532ec780862ab025310a29dc8 /include/asm-arm
parenteade97cce3abc7682d51ea02b77703024067ebea (diff)
tracking-2.6.25-upstream-s3c2410_gpio_irq2pin.patch
Holger got beaten to it on mainline, they provide a s3c2410_gpio_irq2pin() instead of the name he used. Signed-off-by: Andy Green <andy@openmoko.com>
Diffstat (limited to 'include/asm-arm')
-rw-r--r--include/asm-arm/arch-s3c2410/gpio.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/include/asm-arm/arch-s3c2410/gpio.h b/include/asm-arm/arch-s3c2410/gpio.h
index b2bc7bfea63..45228c8a92c 100644
--- a/include/asm-arm/arch-s3c2410/gpio.h
+++ b/include/asm-arm/arch-s3c2410/gpio.h
@@ -55,9 +55,9 @@ static inline int gpio_direction_output(unsigned gpio, int value)
#define gpio_to_irq(gpio) s3c2400_gpio_getirq(gpio)
#else
#define gpio_to_irq(gpio) s3c2410_gpio_getirq(gpio)
-#define irq_to_gpio(irq) s3c2410_irq_to_gpio(irq)
+#define irq_to_gpio(irq) s3c2410_gpio_irq2pin(irq)
#endif
-/* FIXME implement irq_to_gpio() */
-
#include <asm-generic/gpio.h>
+#endif
+