serial: convert early_uart to earlycon for 8250

[net-next-2.6.git] / init / main.c

diff --git a/init/main.c b/init/main.c
index 0eb1c7463fe4d08c3012ee66cb486c72122a26d5..038c7cb52390caf7ffe5b80b092f9dd9c80a8489 100644 (file)
--- a/init/main.c
+++ b/init/main.c
@@ -453,7 +453,10 @@ static int __init do_early_param(char *param, char *val)
        struct obs_kernel_param *p;
 
        for (p = __setup_start; p < __setup_end; p++) {
-               if (p->early && strcmp(param, p->str) == 0) {
+               if ((p->early && strcmp(param, p->str) == 0) ||
+                   (strcmp(param, "console") == 0 &&
+                    strcmp(p->str, "earlycon") == 0)
+               ) {
                        if (p->setup_func(val) != 0)
                                printk(KERN_WARNING
                                       "Malformed early option '%s'\n", param);