From: Natalie Protasevich This is the patch to fix build problem with es7000. Conflict while building without ACPI being set. Made es7000_plat to be defined for both ACPI and non-ACPI cases. Signed-off-by: Natalie Protasevich Signed-off-by: Randy Dunlap --- mpparse.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff -Naur linux-next/arch/x86/kernel/mpparse.c linux-next-mod/arch/x86/kernel/mpparse.c --- linux-next/arch/x86/kernel/mpparse.c 2008-05-02 14:26:02.000000000 -0700 +++ linux-next-mod/arch/x86/kernel/mpparse.c 2008-05-02 14:34:00.000000000 -0700 @@ -790,6 +790,8 @@ __find_smp_config(1); } +int es7000_plat; + /* -------------------------------------------------------------------------- ACPI-based MP Configuration -------------------------------------------------------------------------- */ @@ -909,8 +911,6 @@ MP_intsrc_info(&intsrc); } -int es7000_plat; - void __init mp_config_acpi_legacy_irqs(void) { struct mpc_config_intsrc intsrc;