Merge branch 'linus' into cpus4096

1 files changed, 4 insertions, 4 deletions

diff --git a/arch/arm/mach-sa1100/irq.c b/arch/arm/mach-sa1100/irq.c
index fa0403af7eec..c5e438b12ec7 100644
--- a/arch/arm/mach-sa1100/irq.c
+++ b/arch/arm/mach-sa1100/irq.c
@@ -46,17 +46,17 @@ static int sa1100_gpio_type(unsigned int irq, unsigned int type)
         else
                 mask = GPIO11_27_MASK(irq);
 
-        if (type == IRQT_PROBE) {
+        if (type == IRQ_TYPE_PROBE) {
                 if ((GPIO_IRQ_rising_edge | GPIO_IRQ_falling_edge) & mask)
                         return 0;
-                type = __IRQT_RISEDGE | __IRQT_FALEDGE;
+                type = IRQ_TYPE_EDGE_RISING | IRQ_TYPE_EDGE_FALLING;
         }
 
-        if (type & __IRQT_RISEDGE) {
+        if (type & IRQ_TYPE_EDGE_RISING) {
                 GPIO_IRQ_rising_edge |= mask;
         } else
                 GPIO_IRQ_rising_edge &= ~mask;
-        if (type & __IRQT_FALEDGE) {
+        if (type & IRQ_TYPE_EDGE_FALLING) {
                 GPIO_IRQ_falling_edge |= mask;
         } else
                 GPIO_IRQ_falling_edge &= ~mask;