Merge branch 'for-2.6.33' of git://linux-nfs.org/~bfields/linux

[profile/ivi/kernel-adaptation-intel-automotive.git] / drivers / parisc / iosapic.c

diff --git a/drivers/parisc/iosapic.c b/drivers/parisc/iosapic.c
index 4a9cc92..c768367 100644 (file)
--- a/drivers/parisc/iosapic.c
+++ b/drivers/parisc/iosapic.c
@@ -729,8 +729,8 @@ static int iosapic_set_affinity_irq(unsigned int irq,
 }
 #endif
 
-static struct hw_interrupt_type iosapic_interrupt_type = {
-       .typename =     "IO-SAPIC-level",
+static struct irq_chip iosapic_interrupt_type = {
+       .name    =      "IO-SAPIC-level",
        .startup =      iosapic_startup_irq,
        .shutdown =     iosapic_disable_irq,
        .enable =       iosapic_enable_irq,