summaryrefslogtreecommitdiffstats
path: root/arch/x86
diff options
context:
space:
mode:
authorIngo Molnar <mingo@elte.hu>2008-05-03 22:01:31 +0200
committerIngo Molnar <mingo@elte.hu>2008-05-04 20:04:45 +0200
commite37ee42caadab46cec277546099fa2a6207fff0b (patch)
tree721771ef00d95066abe574b457be065e6390d363 /arch/x86
parentc5562faeaacf19e81a78ee37cc6b96ab1f3e68e4 (diff)
downloadlinux-e37ee42caadab46cec277546099fa2a6207fff0b.tar.gz
linux-e37ee42caadab46cec277546099fa2a6207fff0b.tar.bz2
linux-e37ee42caadab46cec277546099fa2a6207fff0b.zip
x86: es7000 build fix
Signed-off-by: Ingo Molnar <mingo@elte.hu> Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Diffstat (limited to 'arch/x86')
-rw-r--r--arch/x86/kernel/mpparse.c7
1 files changed, 5 insertions, 2 deletions
diff --git a/arch/x86/kernel/mpparse.c b/arch/x86/kernel/mpparse.c
index 3e2c54dc8b29..404683b94e79 100644
--- a/arch/x86/kernel/mpparse.c
+++ b/arch/x86/kernel/mpparse.c
@@ -794,6 +794,11 @@ void __init find_smp_config(void)
ACPI-based MP Configuration
-------------------------------------------------------------------------- */
+/*
+ * Keep this outside and initialized to 0, for !CONFIG_ACPI builds:
+ */
+int es7000_plat;
+
#ifdef CONFIG_ACPI
#ifdef CONFIG_X86_IO_APIC
@@ -909,8 +914,6 @@ void __init mp_override_legacy_irq(u8 bus_irq, u8 polarity, u8 trigger, u32 gsi)
MP_intsrc_info(&intsrc);
}
-int es7000_plat;
-
void __init mp_config_acpi_legacy_irqs(void)
{
struct mpc_config_intsrc intsrc;