Merge branch 'next/timer' of git://git.linaro.org/people/arnd/arm-soc

[pandora-kernel.git] / arch / arm / mach-versatile / include / mach / gpio.h

diff --git a/arch/arm/mach-versatile/include/mach/gpio.h b/arch/arm/mach-versatile/include/mach/gpio.h
index bd11dc5..40a8c17 100644 (file)
--- a/arch/arm/mach-versatile/include/mach/gpio.h
+++ b/arch/arm/mach-versatile/include/mach/gpio.h
@@ -1,2 +1 @@
-#define __ARM_GPIOLIB_TRIVIAL
-#define gpio_to_irq    __gpio_to_irq
+/* empty */