diff --git a/[refs] b/[refs] index 5219e1bb717b..a41784478898 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 7219bebd72726c13c1eaaa3ade0e829e998fb3b1 +refs/heads/master: 2df297261903249f5ac2d3d14ededbda229397e2 diff --git a/trunk/arch/x86/kernel/mpparse_32.c b/trunk/arch/x86/kernel/mpparse_32.c index 1b225cea5d7b..4cc325edc70d 100644 --- a/trunk/arch/x86/kernel/mpparse_32.c +++ b/trunk/arch/x86/kernel/mpparse_32.c @@ -867,8 +867,6 @@ void __init find_smp_config (void) smp_scan_config(address, 0x400); } -int es7000_plat; - /* -------------------------------------------------------------------------- ACPI-based MP Configuration -------------------------------------------------------------------------- */ @@ -1029,6 +1027,8 @@ mp_override_legacy_irq(u8 bus_irq, u8 polarity, u8 trigger, u32 gsi) panic("Max # of irq sources exceeded!\n"); } +int es7000_plat; + void __init mp_config_acpi_legacy_irqs (void) { struct mpc_config_intsrc intsrc;