Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/hskinnemoen...

[~andy/linux] / include / asm-sh / bugs.h

diff --git a/include/asm-sh/bugs.h b/include/asm-sh/bugs.h
index aeee8da9c54f57dea4036b12686fcf9ec002951a..121b2ecddfc35d46042677e1304913461937b71d 100644 (file)
--- a/include/asm-sh/bugs.h
+++ b/include/asm-sh/bugs.h
@@ -25,21 +25,21 @@ static void __init check_bugs(void)
        case CPU_SH7619:
                *p++ = '2';
                break;
-       case CPU_SH7206:
+       case CPU_SH7203 ... CPU_MXG:
                *p++ = '2';
                *p++ = 'a';
                break;
-       case CPU_SH7705 ... CPU_SH7300:
+       case CPU_SH7705 ... CPU_SH7729:
                *p++ = '3';
                break;
        case CPU_SH7750 ... CPU_SH4_501:
                *p++ = '4';
                break;
-       case CPU_SH7770 ... CPU_SHX3:
+       case CPU_SH7763 ... CPU_SHX3:
                *p++ = '4';
                *p++ = 'a';
                break;
-       case CPU_SH73180 ... CPU_SH7722:
+       case CPU_SH7343 ... CPU_SH7366:
                *p++ = '4';
                *p++ = 'a';
                *p++ = 'l';
@@ -48,9 +48,16 @@ static void __init check_bugs(void)
                *p++ = 's';
                *p++ = 'p';
                break;
-       default:
-               *p++ = '?';
-               *p++ = '!';
+       case CPU_SH5_101 ... CPU_SH5_103:
+               *p++ = '6';
+               *p++ = '4';
+               break;
+       case CPU_SH_NONE:
+               /*
+                * Specifically use CPU_SH_NONE rather than default:,
+                * so we're able to have the compiler whine about
+                * unhandled enumerations.
+                */
                break;
        }