Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/ide-2.6

[mv-sheeva.git] / arch / alpha / kernel / sys_wildfire.c

diff --git a/arch/alpha/kernel/sys_wildfire.c b/arch/alpha/kernel/sys_wildfire.c
index 42c3eede4d099a3a970f9d78e25f42f3f8eeb8b1..e91b4c3838a8d3e5f21f4e5aa01d7135014fbe14 100644 (file)
--- a/arch/alpha/kernel/sys_wildfire.c
+++ b/arch/alpha/kernel/sys_wildfire.c
@@ -157,7 +157,7 @@ wildfire_end_irq(unsigned int irq)
                wildfire_enable_irq(irq);
 }
 
-static struct hw_interrupt_type wildfire_irq_type = {
+static struct irq_chip wildfire_irq_type = {
        .typename       = "WILDFIRE",
        .startup        = wildfire_startup_irq,
        .shutdown       = wildfire_disable_irq,