ARM: 5816/1: SA1100: h3600: remove IRQ_GPIO_* definitions

As all the remaining users of these definitions
(in pcmcia/sa1100_h3600 driver) were converted to gpio_to_irq(),
they can be safely removed.

Signed-off-by: Dmitry Artamonow <mad_soft@inbox.ru>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>

diff --git a/arch/arm/mach-sa1100/include/mach/h3600.h b/arch/arm/mach-sa1100/include/mach/h3600.h
index 19d7fe1b5874f44870a7db85750e121bac5a2097..f4911dbf6b379f1d072a150146e44a8bbe925cbf 100644 (file)
--- a/arch/arm/mach-sa1100/include/mach/h3600.h
+++ b/arch/arm/mach-sa1100/include/mach/h3600.h
@@ -57,13 +57,4 @@
 #define GPIO_H3600_COM_CTS             GPIO_GPIO (25)
 #define GPIO_H3600_COM_RTS             GPIO_GPIO (26)
 
-#define IRQ_GPIO_H3600_NPOWER_BUTTON   IRQ_GPIO0
-#define IRQ_GPIO_H3600_PCMCIA_CD1      IRQ_GPIO10
-#define IRQ_GPIO_H3600_PCMCIA_IRQ1     IRQ_GPIO11
-#define IRQ_GPIO_H3600_PCMCIA_CD0      IRQ_GPIO17
-#define IRQ_GPIO_H3600_PCMCIA_IRQ0     IRQ_GPIO21
-#define IRQ_GPIO_H3600_COM_DCD         IRQ_GPIO23
-#define IRQ_GPIO_H3600_OPT_IRQ         IRQ_GPIO24
-#define IRQ_GPIO_H3600_COM_CTS         IRQ_GPIO25
-
 #endif /* _INCLUDE_H3600_H_ */

diff --git a/arch/arm/mach-sa1100/include/mach/h3600_gpio.h b/arch/arm/mach-sa1100/include/mach/h3600_gpio.h
index 6cfbc649f1892c228bf28725d459251deaf39b74..0c0bfa5464f43ed90be3cdca0a4b825727d4db20 100644 (file)
--- a/arch/arm/mach-sa1100/include/mach/h3600_gpio.h
+++ b/arch/arm/mach-sa1100/include/mach/h3600_gpio.h
@@ -71,11 +71,6 @@
 #define GPIO_H3600_OPT_LOCK            GPIO_GPIO (22)
 #define GPIO_H3600_OPT_DET             GPIO_GPIO (27)
 
-/****************************************************/
-
-#define IRQ_GPIO_H3600_ACTION_BUTTON    IRQ_GPIO18
-#define IRQ_GPIO_H3600_OPT_DET         IRQ_GPIO27
-
 
 /* H3100 / 3600 EGPIO pins */
 #define H3XXX_EGPIO_BASE               (GPIO_MAX + 1)