From: Josh Boyer Date: Mon, 24 Dec 2007 14:44:47 +0000 (-0600) Subject: [POWERPC] Conditionally compile e200 and e500 platforms in cputable X-Git-Tag: v2.6.25-rc1~1131^2~147 X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=e3e414bcc2e994f98ca647f16fb31799570dc574;p=linux-2.6-omap-h63xx.git [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 --- diff --git a/arch/powerpc/kernel/cputable.c b/arch/powerpc/kernel/cputable.c index 85868fc6b29..f1928af5fcf 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,