Merge master.kernel.org:/home/rmk/linux-2.6-i2c manually

[powerpc.git] / arch / x86_64 / kernel / head64.c

diff --git a/arch/x86_64/kernel/head64.c b/arch/x86_64/kernel/head64.c
index 77df2cc..cf6ab14 100644 (file)
--- a/arch/x86_64/kernel/head64.c
+++ b/arch/x86_64/kernel/head64.c
@@ -91,13 +91,10 @@ void __init x86_64_start_kernel(char * real_mode_data)
 #ifdef CONFIG_SMP
        cpu_set(0, cpu_online_map);
 #endif
-       /* default console: */
-       if (!strstr(saved_command_line, "console="))
-               strcat(saved_command_line, " console=tty0"); 
        s = strstr(saved_command_line, "earlyprintk=");
        if (s != NULL)
                setup_early_printk(s);
-#ifdef CONFIG_DISCONTIGMEM
+#ifdef CONFIG_NUMA
        s = strstr(saved_command_line, "numa=");
        if (s != NULL)
                numa_setup(s+5);