Merge branch 'platforms' of git://git.linaro.org/people/rmk/linux-arm

[firefly-linux-kernel-4.4.55.git] / arch / arm / mach-sa1100 / include / mach / shannon.h

diff --git a/arch/arm/mach-sa1100/include/mach/shannon.h b/arch/arm/mach-sa1100/include/mach/shannon.h
index a0d1114c45edd8b9a3ab886c2aa2bbeadc1a3282..fff39e02b4965667d73ef6bde31a9dfb0ff7412a 100644 (file)
--- a/arch/arm/mach-sa1100/include/mach/shannon.h
+++ b/arch/arm/mach-sa1100/include/mach/shannon.h
@@ -23,14 +23,10 @@
 #define SHANNON_GPIO_SENSE_12V         GPIO_GPIO (21)  /* Input, 12v flash unprotect detected */
 #define SHANNON_GPIO_DISP_EN           22              /* out */
 /* XXX GPIO 23 unaccounted for */
-#define SHANNON_GPIO_EJECT_0           GPIO_GPIO (24)  /* in */
-#define SHANNON_IRQ_GPIO_EJECT_0       IRQ_GPIO24
-#define SHANNON_GPIO_EJECT_1           GPIO_GPIO (25)  /* in */
-#define SHANNON_IRQ_GPIO_EJECT_1       IRQ_GPIO25
-#define SHANNON_GPIO_RDY_0             GPIO_GPIO (26)  /* in */
-#define SHANNON_IRQ_GPIO_RDY_0         IRQ_GPIO26
-#define SHANNON_GPIO_RDY_1             GPIO_GPIO (27)  /* in */
-#define SHANNON_IRQ_GPIO_RDY_1         IRQ_GPIO27
+#define SHANNON_GPIO_EJECT_0           24              /* in */
+#define SHANNON_GPIO_EJECT_1           25              /* in */
+#define SHANNON_GPIO_RDY_0             26              /* in */
+#define SHANNON_GPIO_RDY_1             27              /* in */
 
 /* MCP UCB codec GPIO pins... */