Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux...

[deliverable/linux.git] / arch / sparc / kernel / setup_32.c

diff --git a/arch/sparc/kernel/setup_32.c b/arch/sparc/kernel/setup_32.c
index 998cadb4e7f2eb628c85a5d510ad0d613836ac18..9be2af55c5cd5f93bfc15895a07192b355d2bb08 100644 (file)
--- a/arch/sparc/kernel/setup_32.c
+++ b/arch/sparc/kernel/setup_32.c
@@ -235,6 +235,8 @@ void __init setup_arch(char **cmdline_p)
                sparc_cpu_model = sun4e;
        if (!strcmp(&cputypval,"sun4u"))
                sparc_cpu_model = sun4u;
+       if (!strncmp(&cputypval, "leon" , 4))
+               sparc_cpu_model = sparc_leon;
 
        printk("ARCH: ");
        switch(sparc_cpu_model) {
@@ -256,6 +258,9 @@ void __init setup_arch(char **cmdline_p)
        case sun4u:
                printk("SUN4U\n");
                break;
+       case sparc_leon:
+               printk("LEON\n");
+               break;
        default:
                printk("UNKNOWN!\n");
                break;
@@ -263,8 +268,6 @@ void __init setup_arch(char **cmdline_p)
 
 #ifdef CONFIG_DUMMY_CONSOLE
        conswitchp = &dummy_con;
-#elif defined(CONFIG_PROM_CONSOLE)
-       conswitchp = &prom_con;
 #endif
        boot_flags_init(*cmdline_p);