Merge remote branch 'nouveau/for-airlied' of nouveau-2.6

[karo-tx-linux.git] / drivers / parisc / gsc.c

diff --git a/drivers/parisc/gsc.c b/drivers/parisc/gsc.c
index 647adc9f85adf1118f7b294a89cac45200344b6c..c4e1f3c3c2fadd9cc1c4bf6f5e6561e803b3002d 100644 (file)
--- a/drivers/parisc/gsc.c
+++ b/drivers/parisc/gsc.c
@@ -149,7 +149,7 @@ static unsigned int gsc_asic_startup_irq(unsigned int irq)
 }
 
 static struct irq_chip gsc_asic_interrupt_type = {
-       .typename =     "GSC-ASIC",
+       .name    =      "GSC-ASIC",
        .startup =      gsc_asic_startup_irq,
        .shutdown =     gsc_asic_disable_irq,
        .enable =       gsc_asic_enable_irq,