Pull battery into release branch

[linux-2.6] / include / asm-sh / bugs.h

diff --git a/include/asm-sh/bugs.h b/include/asm-sh/bugs.h
index 795047da5e17e28cc0f433209a4d5afc48284ca2..aeee8da9c54f57dea4036b12686fcf9ec002951a 100644 (file)
--- a/include/asm-sh/bugs.h
+++ b/include/asm-sh/bugs.h
@@ -16,14 +16,13 @@
 
 static void __init check_bugs(void)
 {
-       extern char *get_cpu_subtype(void);
        extern unsigned long loops_per_jiffy;
-       char *p= &init_utsname()->machine[2]; /* "sh" */
+       char *p = &init_utsname()->machine[2]; /* "sh" */
 
-       cpu_data->loops_per_jiffy = loops_per_jiffy;
+       current_cpu_data.loops_per_jiffy = loops_per_jiffy;
 
-       switch (cpu_data->type) {
-       case CPU_SH7604 ... CPU_SH7619:
+       switch (current_cpu_data.type) {
+       case CPU_SH7619:
                *p++ = '2';
                break;
        case CPU_SH7206:
@@ -36,17 +35,26 @@ static void __init check_bugs(void)
        case CPU_SH7750 ... CPU_SH4_501:
                *p++ = '4';
                break;
-       case CPU_SH7770 ... CPU_SH7785:
+       case CPU_SH7770 ... CPU_SHX3:
                *p++ = '4';
                *p++ = 'a';
                break;
+       case CPU_SH73180 ... CPU_SH7722:
+               *p++ = '4';
+               *p++ = 'a';
+               *p++ = 'l';
+               *p++ = '-';
+               *p++ = 'd';
+               *p++ = 's';
+               *p++ = 'p';
+               break;
        default:
                *p++ = '?';
                *p++ = '!';
                break;
        }
 
-       printk("CPU: %s\n", get_cpu_subtype());
+       printk("CPU: %s\n", get_cpu_subtype(&current_cpu_data));
 
 #ifndef __LITTLE_ENDIAN__
        /* 'eb' means 'Endian Big' */