Fedora kernel-2.6.17-1.2142_FC4 patched with stable patch-2.6.17.4-vs2.0.2-rc26.diff

[linux-2.6.git] / arch / ppc / syslib / cpc700_pic.c

diff --git a/arch/ppc/syslib/cpc700_pic.c b/arch/ppc/syslib/cpc700_pic.c
index 7747098..5add0a9 100644 (file)
--- a/arch/ppc/syslib/cpc700_pic.c
+++ b/arch/ppc/syslib/cpc700_pic.c
@@ -1,6 +1,4 @@
 /*
- * arch/ppc/syslib/cpc700_pic.c
- *
  * Interrupt controller support for IBM Spruce
  *
  * Authors: Mark Greer, Matt Porter, and Johnnie Peters
@@ -90,14 +88,10 @@ cpc700_mask_and_ack_irq(unsigned int irq)
 }
 
 static struct hw_interrupt_type cpc700_pic = {
-       "CPC700 PIC",
-       NULL,
-       NULL,
-       cpc700_unmask_irq,
-       cpc700_mask_irq,
-       cpc700_mask_and_ack_irq,
-       NULL,
-       NULL
+       .typename = "CPC700 PIC",
+       .enable = cpc700_unmask_irq,
+       .disable = cpc700_mask_irq,
+       .ack = cpc700_mask_and_ack_irq,
 };
 
 __init static void