Merge git://git.kernel.org/pub/scm/linux/kernel/git/sam/kbuild-fixes

[linux-2.6-omap-h63xx.git] / arch / arm / mach-sa1100 / h3600.c

diff --git a/arch/arm/mach-sa1100/h3600.c b/arch/arm/mach-sa1100/h3600.c
index 8473c37b77d6e1bf4f5c7d6ce06109793c4275c4..8c560ae0869cee9dd990017b9af6fd73a7fd4157 100644 (file)
--- a/arch/arm/mach-sa1100/h3600.c
+++ b/arch/arm/mach-sa1100/h3600.c
@@ -30,7 +30,7 @@
 #include <linux/serial_core.h>
 
 #include <asm/irq.h>
-#include <asm/hardware.h>
+#include <asm/arch/hardware.h>
 #include <asm/mach-types.h>
 #include <asm/setup.h>
 
@@ -834,7 +834,7 @@ static void __init h3800_init_irq(void)
                set_irq_chip(irq, &h3800_gpio_irqchip);
        }
 #endif
-       set_irq_type(IRQ_GPIO_H3800_ASIC, IRQT_RISING);
+       set_irq_type(IRQ_GPIO_H3800_ASIC, IRQ_TYPE_EDGE_RISING);
        set_irq_chained_handler(IRQ_GPIO_H3800_ASIC, h3800_IRQ_demux);
 }