vserver 1.9.3

[linux-2.6.git] / arch / ppc / platforms / 85xx / mpc85xx_cds_common.c

diff --git a/arch/ppc/platforms/85xx/mpc85xx_cds_common.c b/arch/ppc/platforms/85xx/mpc85xx_cds_common.c
index c7e53e3..5eb6e42 100644 (file)
--- a/arch/ppc/platforms/85xx/mpc85xx_cds_common.c
+++ b/arch/ppc/platforms/85xx/mpc85xx_cds_common.c
@@ -307,7 +307,7 @@ mpc85xx_exclude_device(u_char bus, u_char devfn)
 {
        if (bus == 0 && PCI_SLOT(devfn) == 0)
                return PCIBIOS_DEVICE_NOT_FOUND;
-#if CONFIG_85xx_PCI2
+#ifdef CONFIG_85xx_PCI2
        /* With the current code we know PCI2 will be bus 2, however this may
         * not be guarnteed */
        if (bus == 2 && PCI_SLOT(devfn) == 0)
@@ -358,10 +358,6 @@ mpc85xx_cds_setup_arch(void)
         mpc85xx_setup_hose();
 #endif
 
-#ifdef CONFIG_DUMMY_CONSOLE
-        conswitchp = &dummy_con;
-#endif
-
 #ifdef CONFIG_SERIAL_8250
         mpc85xx_early_serial_map();
 #endif