Merge branch 'for-linus' of git://neil.brown.name/md

[karo-tx-linux.git] / arch / ia64 / kernel / irq_lsapic.c

diff --git a/arch/ia64/kernel/irq_lsapic.c b/arch/ia64/kernel/irq_lsapic.c
index e56a7a36aca30d061538fb490e86ec9241b25eed..fc1549d4564da16ff067e5bf76c8536480137648 100644 (file)
--- a/arch/ia64/kernel/irq_lsapic.c
+++ b/arch/ia64/kernel/irq_lsapic.c
@@ -33,7 +33,7 @@ static int lsapic_retrigger(unsigned int irq)
        return 1;
 }
 
-struct hw_interrupt_type irq_type_ia64_lsapic = {
+struct irq_chip irq_type_ia64_lsapic = {
        .name =         "LSAPIC",
        .startup =      lsapic_noop_startup,
        .shutdown =     lsapic_noop,