Merge git://git.infradead.org/battery-2.6

[linux-2.6-omap-h63xx.git] / arch / ppc / platforms / prep_setup.c

diff --git a/arch/ppc/platforms/prep_setup.c b/arch/ppc/platforms/prep_setup.c
index 1cb75a1f825e4a431589a4940772308c44381d5f..3c56654bfc6f28580a42a7e4cc4a043dcd8e300d 100644 (file)
--- a/arch/ppc/platforms/prep_setup.c
+++ b/arch/ppc/platforms/prep_setup.c
@@ -69,9 +69,6 @@
 
 TODC_ALLOC();
 
-unsigned char ucBoardRev;
-unsigned char ucBoardRevMaj, ucBoardRevMin;
-
 extern unsigned char prep_nvram_read_val(int addr);
 extern void prep_nvram_write_val(int addr,
                                 unsigned char val);
@@ -593,7 +590,7 @@ static void __init prep_init_sound(void)
        PPC_DEVICE *audiodevice = NULL;
 
        /*
-        * Get the needed resource informations from residual data.
+        * Get the needed resource information from residual data.
         *
         */
        if (have_residual_data)
@@ -632,9 +629,9 @@ static void __init prep_init_sound(void)
        }
 
        /*
-        * Find a way to push these informations to the cs4232 driver
+        * Find a way to push this information to the cs4232 driver
         * Give it out with printk, when not in cmd_line?
-        * Append it to  cmd_line and saved_command_line?
+        * Append it to cmd_line and boot_command_line?
         * Format is cs4232=io,irq,dma,dma2
         */
 }
@@ -897,7 +894,7 @@ prep_setup_arch(void)
                 if (bootargs != NULL) {
                         strcpy(cmd_line, bootargs);
                         /* again.. */
-                        strcpy(saved_command_line, cmd_line);
+                        strcpy(boot_command_line, cmd_line);
                }
        }