vserver 1.9.3

[linux-2.6.git] / arch / ppc / platforms / sandpoint.c

diff --git a/arch/ppc/platforms/sandpoint.c b/arch/ppc/platforms/sandpoint.c
index ab682fa..d9307a2 100644 (file)
--- a/arch/ppc/platforms/sandpoint.c
+++ b/arch/ppc/platforms/sandpoint.c
@@ -303,10 +303,6 @@ sandpoint_setup_arch(void)
        /* Lookup PCI host bridges */
        sandpoint_find_bridges();
 
-#ifdef CONFIG_DUMMY_CONSOLE
-       conswitchp = &dummy_con;
-#endif
-
        printk(KERN_INFO "Motorola SPS Sandpoint Test Platform\n");
        printk(KERN_INFO "Port by MontaVista Software, Inc. (source@mvista.com)\n");
 
@@ -433,17 +429,7 @@ sandpoint_init_IRQ(void)
        OpenPIC_InitSenses = sandpoint_openpic_initsenses;
        OpenPIC_NumInitSenses = sizeof(sandpoint_openpic_initsenses);
 
-       /*
-        * We need to tell openpic_set_sources where things actually are.
-        * mpc10x_common will setup OpenPIC_Addr at ioremap(EUMB phys base +
-        * EPIC offset (0x40000));  The EPIC IRQ Register Address Map -
-        * Interrupt Source Configuration Registers gives these numbers
-        * as offsets starting at 0x50200, we need to adjust occordinly.
-        */
-       /* Map serial interrupts 0-15 */
-       openpic_set_sources(0, 16, OpenPIC_Addr + 0x10200);
-
-       openpic_init(NUM_8259_INTERRUPTS);
+       mpc10x_set_openpic();
        openpic_hookup_cascade(NUM_8259_INTERRUPTS, "82c59 cascade",
                        i8259_irq);