Merge branch 'samsung/driver' into next/drivers

[mv-sheeva.git] / arch / arm / mach-pxa / include / mach / gpio.h

diff --git a/arch/arm/mach-pxa/include/mach/gpio.h b/arch/arm/mach-pxa/include/mach/gpio.h
index 004cade7bb13b4c24ad642272f75388ebc101ef1..0248e433bc982525e69d641fe576e960e65ea437 100644 (file)
--- a/arch/arm/mach-pxa/include/mach/gpio.h
+++ b/arch/arm/mach-pxa/include/mach/gpio.h
@@ -25,24 +25,8 @@
 #define __ASM_ARCH_PXA_GPIO_H
 
 #include <asm-generic/gpio.h>
-/* The defines for the driver are needed for the accelerated accessors */
-#include "gpio-pxa.h"
 
-#define gpio_to_irq(gpio)      IRQ_GPIO(gpio)
+#include <mach/irqs.h>
+#include <mach/hardware.h>
 
-static inline int irq_to_gpio(unsigned int irq)
-{
-       int gpio;
-
-       if (irq == IRQ_GPIO0 || irq == IRQ_GPIO1)
-               return irq - IRQ_GPIO0;
-
-       gpio = irq - PXA_GPIO_IRQ_BASE;
-       if (gpio >= 2 && gpio < NR_BUILTIN_GPIO)
-               return gpio;
-
-       return -1;
-}
-
-#include <plat/gpio.h>
 #endif