X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;ds=sidebyside;f=arch%2Fmips%2Fau1000%2Fpb1200%2Firqmap.c;fp=arch%2Fmips%2Fau1000%2Fpb1200%2Firqmap.c;h=59e70e5cf325ef23c151b4585ab020fcd535c5d9;hb=64ba3f394c830ec48a1c31b53dcae312c56f1604;hp=f66779f0d4cdd6fb7e5b09083311d7a9481522c5;hpb=be1e6109ac94a859551f8e1774eb9a8469fe055c;p=linux-2.6.git

diff --git a/arch/mips/au1000/pb1200/irqmap.c b/arch/mips/au1000/pb1200/irqmap.c
index f66779f0d..59e70e5cf 100644
--- a/arch/mips/au1000/pb1200/irqmap.c
+++ b/arch/mips/au1000/pb1200/irqmap.c
@@ -22,6 +22,7 @@
  *  with this program; if not, write  to the Free Software Foundation, Inc.,
  *  675 Mass Ave, Cambridge, MA 02139, USA.
  */
+#include <linux/config.h>
 #include <linux/errno.h>
 #include <linux/init.h>
 #include <linux/irq.h>
@@ -54,11 +55,11 @@
 #define PB1200_INT_END DB1200_INT_END
 #endif
 
-au1xxx_irq_map_t __initdata au1xxx_irq_map[] = {
+au1xxx_irq_map_t au1xxx_irq_map[] = {
 	{ AU1000_GPIO_7, INTC_INT_LOW_LEVEL, 0 }, // This is exteranl interrupt cascade
 };
 
-int __initdata au1xxx_nr_irqs = ARRAY_SIZE(au1xxx_irq_map);
+int au1xxx_nr_irqs = sizeof(au1xxx_irq_map)/sizeof(au1xxx_irq_map_t);
 
 /*
  *	Support for External interrupts on the PbAu1200 Development platform.
@@ -148,7 +149,7 @@ static void pb1200_end_irq(unsigned int irq_nr)
 	}
 }
 
-static struct irq_chip external_irq_type =
+static struct hw_interrupt_type external_irq_type =
 {
 #ifdef CONFIG_MIPS_PB1200
 	"Pb1200 Ext",
@@ -171,7 +172,7 @@ void _board_init_irq(void)
 
 	for (irq_nr = PB1200_INT_BEGIN; irq_nr <= PB1200_INT_END; irq_nr++)
 	{
-		irq_desc[irq_nr].chip = &external_irq_type;
+		irq_desc[irq_nr].handler = &external_irq_type;
 		pb1200_disable_irq(irq_nr);
 	}