diff options
Diffstat (limited to 'arch/powerpc/kernel/cputable.c')
-rw-r--r-- | arch/powerpc/kernel/cputable.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/arch/powerpc/kernel/cputable.c b/arch/powerpc/kernel/cputable.c index bfe5f4a2886b..e745abc5457a 100644 --- a/arch/powerpc/kernel/cputable.c +++ b/arch/powerpc/kernel/cputable.c | |||
@@ -569,7 +569,7 @@ static struct cpu_spec __initdata cpu_specs[] = { | |||
569 | #endif /* CONFIG_PPC_BOOK3S_64 */ | 569 | #endif /* CONFIG_PPC_BOOK3S_64 */ |
570 | 570 | ||
571 | #ifdef CONFIG_PPC32 | 571 | #ifdef CONFIG_PPC32 |
572 | #ifdef CONFIG_PPC_BOOK3S_32 | 572 | #ifdef CONFIG_PPC_BOOK3S_601 |
573 | { /* 601 */ | 573 | { /* 601 */ |
574 | .pvr_mask = 0xffff0000, | 574 | .pvr_mask = 0xffff0000, |
575 | .pvr_value = 0x00010000, | 575 | .pvr_value = 0x00010000, |
@@ -583,6 +583,8 @@ static struct cpu_spec __initdata cpu_specs[] = { | |||
583 | .machine_check = machine_check_generic, | 583 | .machine_check = machine_check_generic, |
584 | .platform = "ppc601", | 584 | .platform = "ppc601", |
585 | }, | 585 | }, |
586 | #endif /* CONFIG_PPC_BOOK3S_601 */ | ||
587 | #ifdef CONFIG_PPC_BOOK3S_6xx | ||
586 | { /* 603 */ | 588 | { /* 603 */ |
587 | .pvr_mask = 0xffff0000, | 589 | .pvr_mask = 0xffff0000, |
588 | .pvr_value = 0x00030000, | 590 | .pvr_value = 0x00030000, |
@@ -1212,7 +1214,7 @@ static struct cpu_spec __initdata cpu_specs[] = { | |||
1212 | .machine_check = machine_check_generic, | 1214 | .machine_check = machine_check_generic, |
1213 | .platform = "ppc603", | 1215 | .platform = "ppc603", |
1214 | }, | 1216 | }, |
1215 | #endif /* CONFIG_PPC_BOOK3S_32 */ | 1217 | #endif /* CONFIG_PPC_BOOK3S_6xx */ |
1216 | #ifdef CONFIG_PPC_8xx | 1218 | #ifdef CONFIG_PPC_8xx |
1217 | { /* 8xx */ | 1219 | { /* 8xx */ |
1218 | .pvr_mask = 0xffff0000, | 1220 | .pvr_mask = 0xffff0000, |