This patch moves es7000_plat global variable out of DMI code. Signed-off-by: Andrey Panin arch/i386/kernel/dmi_scan.c | 2 -- arch/i386/kernel/mpparse.c | 1 + 2 files changed, 1 insertion(+), 2 deletions(-) diff -urdpNX /usr/share/dontdiff linux-2.6.11.vanilla/arch/i386/kernel/dmi_scan.c linux-2.6.11/arch/i386/kernel/dmi_scan.c --- linux-2.6.11.vanilla/arch/i386/kernel/dmi_scan.c 2005-03-08 18:02:00.000000000 +0300 +++ linux-2.6.11/arch/i386/kernel/dmi_scan.c 2005-03-08 18:04:38.000000000 +0300 @@ -12,8 +12,6 @@ #include -int es7000_plat = 0; - struct dmi_header { u8 type; diff -urdpNX /usr/share/dontdiff linux-2.6.11.vanilla/arch/i386/kernel/mpparse.c linux-2.6.11/arch/i386/kernel/mpparse.c --- linux-2.6.11.vanilla/arch/i386/kernel/mpparse.c 2005-03-02 10:37:53.000000000 +0300 +++ linux-2.6.11/arch/i386/kernel/mpparse.c 2005-03-08 18:05:28.000000000 +0300 @@ -982,6 +982,7 @@ void __init mp_override_legacy_irq ( return; } +int es7000_plat; void __init mp_config_acpi_legacy_irqs (void) {