1 files changed, 12 insertions, 12 deletions
diff --git a/arch/sh/include/asm/bugs.h b/arch/sh/include/asm/bugs.h
index 4924ff6f5439..46260fcbdf4b 100644
--- a/arch/sh/include/asm/bugs.h
+++ b/arch/sh/include/asm/bugs.h
@@ -21,25 +21,25 @@ static void __init check_bugs(void)
        current_cpu_data.loops_per_jiffy = loops_per_jiffy;
-        switch (current_cpu_data.type) {
+        switch (current_cpu_data.family) {
-        case CPU_SH7619:
+        case CPU_FAMILY_SH2:
                *p++ = '2';
                break;
-        case CPU_SH7201 ... CPU_MXG:
+        case CPU_FAMILY_SH2A:
                *p++ = '2';
                *p++ = 'a';
                break;
-        case CPU_SH7705 ... CPU_SH7729:
+        case CPU_FAMILY_SH3:
                *p++ = '3';
                break;
-        case CPU_SH7750 ... CPU_SH4_501:
+        case CPU_FAMILY_SH4:
                *p++ = '4';
                break;
-        case CPU_SH7763 ... CPU_SHX3:
+        case CPU_FAMILY_SH4A:
                *p++ = '4';
                *p++ = 'a';
                break;
-        case CPU_SH7343 ... CPU_SH7366:
+        case CPU_FAMILY_SH4AL_DSP:
                *p++ = '4';
                *p++ = 'a';
                *p++ = 'l';
@@ -48,15 +48,15 @@ static void __init check_bugs(void)
                *p++ = 's';
                *p++ = 'p';
                break;
-        case CPU_SH5_101 ... CPU_SH5_103:
+        case CPU_FAMILY_SH5:
                *p++ = '6';
                *p++ = '4';
                break;
-        case CPU_SH_NONE:
+        case CPU_FAMILY_UNKNOWN:
                /*
-                 * Specifically use CPU_SH_NONE rather than default:,
+                 * Specifically use CPU_FAMILY_UNKNOWN rather than
-                 * so we're able to have the compiler whine about
+                 * default:, so we're able to have the compiler whine
-                 * unhandled enumerations.
+                 * about unhandled enumerations.
                 */
                break;
        }

diff --git a/arch/sh/include/asm/bugs.h b/arch/sh/include/asm/bugs.h index 4924ff6f5439..46260fcbdf4b 100644 --- a/arch/sh/include/asm/bugs.h +++ b/arch/sh/include/asm/bugs.h
@@ -21,25 +21,25 @@ static void __init check_bugs(void)
21		21
22	current_cpu_data.loops_per_jiffy = loops_per_jiffy;	22	current_cpu_data.loops_per_jiffy = loops_per_jiffy;
23		23
24	switch (current_cpu_data.type) {	24	switch (current_cpu_data.family) {
25	case CPU_SH7619:	25	case CPU_FAMILY_SH2:
26	*p++ = '2';	26	*p++ = '2';
27	break;	27	break;
28	case CPU_SH7201 ... CPU_MXG:	28	case CPU_FAMILY_SH2A:
29	*p++ = '2';	29	*p++ = '2';
30	*p++ = 'a';	30	*p++ = 'a';
31	break;	31	break;
32	case CPU_SH7705 ... CPU_SH7729:	32	case CPU_FAMILY_SH3:
33	*p++ = '3';	33	*p++ = '3';
34	break;	34	break;
35	case CPU_SH7750 ... CPU_SH4_501:	35	case CPU_FAMILY_SH4:
36	*p++ = '4';	36	*p++ = '4';
37	break;	37	break;
38	case CPU_SH7763 ... CPU_SHX3:	38	case CPU_FAMILY_SH4A:
39	*p++ = '4';	39	*p++ = '4';
40	*p++ = 'a';	40	*p++ = 'a';
41	break;	41	break;
42	case CPU_SH7343 ... CPU_SH7366:	42	case CPU_FAMILY_SH4AL_DSP:
43	*p++ = '4';	43	*p++ = '4';
44	*p++ = 'a';	44	*p++ = 'a';
45	*p++ = 'l';	45	*p++ = 'l';
@@ -48,15 +48,15 @@ static void __init check_bugs(void)
48	*p++ = 's';	48	*p++ = 's';
49	*p++ = 'p';	49	*p++ = 'p';
50	break;	50	break;
51	case CPU_SH5_101 ... CPU_SH5_103:	51	case CPU_FAMILY_SH5:
52	*p++ = '6';	52	*p++ = '6';
53	*p++ = '4';	53	*p++ = '4';
54	break;	54	break;
55	case CPU_SH_NONE:	55	case CPU_FAMILY_UNKNOWN:
56	/*	56	/*
57	* Specifically use CPU_SH_NONE rather than default:,	57	* Specifically use CPU_FAMILY_UNKNOWN rather than
58	* so we're able to have the compiler whine about	58	* default:, so we're able to have the compiler whine
59	* unhandled enumerations.	59	* about unhandled enumerations.
60	*/	60	*/
61	break;	61	break;
62	}	62	}