aboutsummaryrefslogtreecommitdiffstats
path: root/arch/powerpc
diff options
context:
space:
mode:
authorJosh Boyer <jwboyer@linux.vnet.ibm.com>2007-12-24 09:44:47 -0500
committerJosh Boyer <jwboyer@linux.vnet.ibm.com>2007-12-24 09:44:47 -0500
commite3e414bcc2e994f98ca647f16fb31799570dc574 (patch)
treed68e57e33d41a783341a80e18f0cdd7dc5ae38c0 /arch/powerpc
parent8cb34d291d3bcf03f284a4c44c9d618ffc278a9d (diff)
[POWERPC] Conditionally compile e200 and e500 platforms in cputable
The e200 and e500 platforms are separated in various parts of the kernel with ifdefs, most notably reg_booke.h and traps.c. The new machine_check rework requires them to be similarly separated in cputable.c to avoid compile errors. Signed-off-by: Josh Boyer <jwboyer@linux.vnet.ibm.com>
Diffstat (limited to 'arch/powerpc')
-rw-r--r--arch/powerpc/kernel/cputable.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/powerpc/kernel/cputable.c b/arch/powerpc/kernel/cputable.c
index 85868fc6b290..f1928af5fcfc 100644
--- a/arch/powerpc/kernel/cputable.c
+++ b/arch/powerpc/kernel/cputable.c
@@ -1369,6 +1369,7 @@ static struct cpu_spec __initdata cpu_specs[] = {
1369 }, 1369 },
1370#endif /* CONFIG_44x */ 1370#endif /* CONFIG_44x */
1371#ifdef CONFIG_FSL_BOOKE 1371#ifdef CONFIG_FSL_BOOKE
1372#ifdef CONFIG_E200
1372 { /* e200z5 */ 1373 { /* e200z5 */
1373 .pvr_mask = 0xfff00000, 1374 .pvr_mask = 0xfff00000,
1374 .pvr_value = 0x81000000, 1375 .pvr_value = 0x81000000,
@@ -1396,6 +1397,7 @@ static struct cpu_spec __initdata cpu_specs[] = {
1396 .machine_check = machine_check_e200, 1397 .machine_check = machine_check_e200,
1397 .platform = "ppc5554", 1398 .platform = "ppc5554",
1398 }, 1399 },
1400#elif defined(CONFIG_E500)
1399 { /* e500 */ 1401 { /* e500 */
1400 .pvr_mask = 0xffff0000, 1402 .pvr_mask = 0xffff0000,
1401 .pvr_value = 0x80200000, 1403 .pvr_value = 0x80200000,
@@ -1432,6 +1434,7 @@ static struct cpu_spec __initdata cpu_specs[] = {
1432 .platform = "ppc8548", 1434 .platform = "ppc8548",
1433 }, 1435 },
1434#endif 1436#endif
1437#endif
1435#if !CLASSIC_PPC 1438#if !CLASSIC_PPC
1436 { /* default match */ 1439 { /* default match */
1437 .pvr_mask = 0x00000000, 1440 .pvr_mask = 0x00000000,