Merge branch 'for-linus' of git://git.o-hand.com/linux-rpurdie-leds

[sfrench/cifs-2.6.git] / arch / powerpc / platforms / 85xx / mpc8544_ds.c

diff --git a/arch/powerpc/platforms/85xx/mpc8544_ds.c b/arch/powerpc/platforms/85xx/mpc8544_ds.c
index 2867f85e632553a898a79ba9fe5295d022f3f676..6fb90aab879fc96a895225527ce481a9999b7560 100644 (file)
--- a/arch/powerpc/platforms/85xx/mpc8544_ds.c
+++ b/arch/powerpc/platforms/85xx/mpc8544_ds.c
@@ -61,30 +61,17 @@ void __init mpc8544_ds_pic_init(void)
                return;
        }
 
-       /* Alloc mpic structure and per isu has 16 INT entries. */
        mpic = mpic_alloc(np, r.start,
                          MPIC_PRIMARY | MPIC_WANTS_RESET | MPIC_BIG_ENDIAN,
-                         16, 64, " OPENPIC     ");
+                       0, 256, " OpenPIC  ");
        BUG_ON(mpic == NULL);
 
-       /*
-        * 48 Internal Interrupts
-        */
-       mpic_assign_isu(mpic, 0, r.start + 0x10200);
-       mpic_assign_isu(mpic, 1, r.start + 0x10400);
-       mpic_assign_isu(mpic, 2, r.start + 0x10600);
-
-       /*
-        * 16 External interrupts
-        */
-       mpic_assign_isu(mpic, 3, r.start + 0x10000);
-
        mpic_init(mpic);
 
 #ifdef CONFIG_PPC_I8259
        /* Initialize the i8259 controller */
        for_each_node_by_type(np, "interrupt-controller")
-           if (device_is_compatible(np, "chrp,iic")) {
+           if (of_device_is_compatible(np, "chrp,iic")) {
                cascade_node = np;
                break;
        }