Merge branch 'agp-next' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied...

[pandora-kernel.git] / arch / sparc / kernel / setup_32.c

diff --git a/arch/sparc/kernel/setup_32.c b/arch/sparc/kernel/setup_32.c
index 998cadb..16a47ff 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;