vserver 1.9.5.x5

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

diff --git a/arch/ppc/platforms/pmac_setup.c b/arch/ppc/platforms/pmac_setup.c
index 10a2d5f..5139523 100644 (file)
--- a/arch/ppc/platforms/pmac_setup.c
+++ b/arch/ppc/platforms/pmac_setup.c
@@ -51,13 +51,13 @@
 #include <linux/irq.h>
 #include <linux/seq_file.h>
 #include <linux/root_dev.h>
+#include <linux/bitops.h>
 
 #include <asm/reg.h>
 #include <asm/sections.h>
 #include <asm/prom.h>
 #include <asm/system.h>
 #include <asm/pgtable.h>
-#include <asm/bitops.h>
 #include <asm/io.h>
 #include <asm/pci-bridge.h>
 #include <asm/ohare.h>
@@ -103,8 +103,6 @@ int has_l2cache = 0;
 
 static int current_root_goodness = -1;
 
-extern char saved_command_line[];
-
 extern int pmac_newworld;
 
 #define DEFAULT_ROOT_DEVICE Root_SDA1  /* sda1 - slightly silly choice */
@@ -136,7 +134,7 @@ pmac_show_cpuinfo(struct seq_file *m)
 
        if (pmac_call_feature(PMAC_FTR_GET_MB_INFO, NULL, PMAC_MB_INFO_NAME, (int)&mbname) != 0)
                mbname = "Unknown";
-       
+
        /* find motherboard type */
        seq_printf(m, "machine\t\t: ");
        np = find_devices("device-tree");
@@ -196,7 +194,7 @@ pmac_show_cpuinfo(struct seq_file *m)
                int n;
                struct reg_property *reg = (struct reg_property *)
                        get_property(np, "reg", &n);
-       
+
                if (reg != 0) {
                        unsigned long total = 0;
 
@@ -207,9 +205,9 @@ pmac_show_cpuinfo(struct seq_file *m)
        }
 
        /* Checks "l2cr-value" property in the registry */
-       np = find_devices("cpus");      
+       np = find_devices("cpus");
        if (np == 0)
-               np = find_type_devices("cpu");  
+               np = find_type_devices("cpu");
        if (np != 0) {
                unsigned int *l2cr = (unsigned int *)
                        get_property(np, "l2cr-value", NULL);
@@ -277,9 +275,9 @@ pmac_setup_arch(void)
 
        /* Checks "l2cr-value" property in the registry */
        if (cur_cpu_spec[0]->cpu_features & CPU_FTR_L2CR) {
-               struct device_node *np = find_devices("cpus");  
+               struct device_node *np = find_devices("cpus");
                if (np == 0)
-                       np = find_type_devices("cpu");  
+                       np = find_type_devices("cpu");
                if (np != 0) {
                        unsigned int *l2cr = (unsigned int *)
                                get_property(np, "l2cr-value", NULL);
@@ -320,9 +318,6 @@ pmac_setup_arch(void)
 #ifdef CONFIG_NVRAM
        pmac_nvram_init();
 #endif
-#ifdef CONFIG_DUMMY_CONSOLE
-       conswitchp = &dummy_con;
-#endif
 #ifdef CONFIG_BLK_DEV_INITRD
        if (initrd_start)
                ROOT_DEV = Root_RAM0;
@@ -478,11 +473,11 @@ pmac_restart(char *cmd)
                        cuda_poll();
                break;
 #endif /* CONFIG_ADB_CUDA */
-#ifdef CONFIG_ADB_PMU  
+#ifdef CONFIG_ADB_PMU
        case SYS_CTRLER_PMU:
                pmu_restart();
                break;
-#endif /* CONFIG_ADB_PMU */    
+#endif /* CONFIG_ADB_PMU */
        default: ;
        }
 }