diff options
author | Michael Ellerman <mpe@ellerman.id.au> | 2014-07-09 22:29:26 -0400 |
---|---|---|
committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2014-07-28 00:11:22 -0400 |
commit | 1e07a0a0336b6349b72127b7280995301f18dba3 (patch) | |
tree | 20a6026185a75e681b5047bd9f2c790fc24e8139 /arch/powerpc/kernel/cputable.c | |
parent | 804ece07e957298fa15695677c92631744d620af (diff) |
powerpc: Remove CLASSIC_PPC
We have a strange #define in cputable.h called CLASSIC_PPC.
Although it is defined for 32 & 64bit, it's only used for 32bit and
it's basically a duplicate of CONFIG_PPC_BOOK3S_32, so let's use
the latter.
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Diffstat (limited to 'arch/powerpc/kernel/cputable.c')
-rw-r--r-- | arch/powerpc/kernel/cputable.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/powerpc/kernel/cputable.c b/arch/powerpc/kernel/cputable.c index 4fb0bb2ac885..9b6dcaaec1a3 100644 --- a/arch/powerpc/kernel/cputable.c +++ b/arch/powerpc/kernel/cputable.c | |||
@@ -527,7 +527,7 @@ static struct cpu_spec __initdata cpu_specs[] = { | |||
527 | #endif /* CONFIG_PPC_BOOK3S_64 */ | 527 | #endif /* CONFIG_PPC_BOOK3S_64 */ |
528 | 528 | ||
529 | #ifdef CONFIG_PPC32 | 529 | #ifdef CONFIG_PPC32 |
530 | #if CLASSIC_PPC | 530 | #ifdef CONFIG_PPC_BOOK3S_32 |
531 | { /* 601 */ | 531 | { /* 601 */ |
532 | .pvr_mask = 0xffff0000, | 532 | .pvr_mask = 0xffff0000, |
533 | .pvr_value = 0x00010000, | 533 | .pvr_value = 0x00010000, |
@@ -1167,7 +1167,7 @@ static struct cpu_spec __initdata cpu_specs[] = { | |||
1167 | .machine_check = machine_check_generic, | 1167 | .machine_check = machine_check_generic, |
1168 | .platform = "ppc603", | 1168 | .platform = "ppc603", |
1169 | }, | 1169 | }, |
1170 | #endif /* CLASSIC_PPC */ | 1170 | #endif /* CONFIG_PPC_BOOK3S_32 */ |
1171 | #ifdef CONFIG_8xx | 1171 | #ifdef CONFIG_8xx |
1172 | { /* 8xx */ | 1172 | { /* 8xx */ |
1173 | .pvr_mask = 0xffff0000, | 1173 | .pvr_mask = 0xffff0000, |