Pull remove-hotkey into release branch

[sfrench/cifs-2.6.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..f166299571d63a962e4008c48e988d29d7d51cc5 100644 (file)
--- a/arch/ppc/platforms/prep_setup.c
+++ b/arch/ppc/platforms/prep_setup.c
@@ -634,7 +634,7 @@ static void __init prep_init_sound(void)
        /*
         * Find a way to push these informations 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 +897,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);
                }
        }