1 files changed, 5 insertions, 2 deletions

diff --git a/arch/sparc/kernel/setup_32.c b/arch/sparc/kernel/setup_32.c
index 998cadb4e7f2..9be2af55c5cd 100644
--- 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);