[PATCH] ppc32: nvram driver for chrp

[linux-2.6] / arch / ppc / platforms / chrp_setup.c

diff --git a/arch/ppc/platforms/chrp_setup.c b/arch/ppc/platforms/chrp_setup.c
index 56c53bb3dfd41da19ed1eec5023647ba31dad900..f1b70ab3c6fd892a34ef182427e32e63e0c52c2b 100644 (file)
--- a/arch/ppc/platforms/chrp_setup.c
+++ b/arch/ppc/platforms/chrp_setup.c
@@ -436,9 +436,7 @@ void __init chrp_init_IRQ(void)
                                       i8259_irq);
 
        }
-       for (i = 0; i < NUM_8259_INTERRUPTS; i++)
-               irq_desc[i].handler = &i8259_pic;
-       i8259_init(chrp_int_ack);
+       i8259_init(chrp_int_ack, 0);
 
 #if defined(CONFIG_VT) && defined(CONFIG_INPUT_ADBHID) && defined(XMON)
        /* see if there is a keyboard in the device tree
@@ -456,8 +454,7 @@ void __init
 chrp_init2(void)
 {
 #ifdef CONFIG_NVRAM
-// XX replace this in a more saner way
-//     pmac_nvram_init();
+       chrp_nvram_init();
 #endif
 
        request_region(0x20,0x20,"pic1");