diff options
| author | Josh Boyer <jwboyer@linux.vnet.ibm.com> | 2007-12-24 08:44:47 -0600 |
|---|---|---|
| committer | Josh Boyer <jwboyer@linux.vnet.ibm.com> | 2007-12-24 08:44:47 -0600 |
| commit | e3e414bcc2e994f98ca647f16fb31799570dc574 (patch) | |
| tree | d68e57e33d41a783341a80e18f0cdd7dc5ae38c0 /arch/powerpc/kernel/cputable.c | |
| parent | 8cb34d291d3bcf03f284a4c44c9d618ffc278a9d (diff) | |
| download | lwn-e3e414bcc2e994f98ca647f16fb31799570dc574.tar.gz lwn-e3e414bcc2e994f98ca647f16fb31799570dc574.zip | |
[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/kernel/cputable.c')
| -rw-r--r-- | arch/powerpc/kernel/cputable.c | 3 |
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[] = { }, #endif /* CONFIG_44x */ #ifdef CONFIG_FSL_BOOKE +#ifdef CONFIG_E200 { /* e200z5 */ .pvr_mask = 0xfff00000, .pvr_value = 0x81000000, @@ -1396,6 +1397,7 @@ static struct cpu_spec __initdata cpu_specs[] = { .machine_check = machine_check_e200, .platform = "ppc5554", }, +#elif defined(CONFIG_E500) { /* e500 */ .pvr_mask = 0xffff0000, .pvr_value = 0x80200000, @@ -1432,6 +1434,7 @@ static struct cpu_spec __initdata cpu_specs[] = { .platform = "ppc8548", }, #endif +#endif #if !CLASSIC_PPC { /* default match */ .pvr_mask = 0x00000000, |