aboutsummaryrefslogtreecommitdiffstats
path: root/arch/i386/kernel/mpparse.c
diff options
context:
space:
mode:
authorNatalie.Protasevich@unisys.com <Natalie.Protasevich@unisys.com>2006-03-23 05:59:36 -0500
committerLinus Torvalds <torvalds@g5.osdl.org>2006-03-23 10:38:04 -0500
commite5428ede94179ddccaa56308e0f194fa299edbb4 (patch)
treebaba6926b3176442d9bf8cdcc86a5ed30bac22ba /arch/i386/kernel/mpparse.c
parent54a20f8c5d778ed3603130de4b92f64405228611 (diff)
[PATCH] Compilation fix for ES7000 when no ACPI is specified in config (i386)
ES7000 platform code clean up for compilation errors and a warning. Ifdef'd the ACPI related parts in the ES7000 platform code. They were causing compile errors in certain configuration (without ACPI defined). I think this approach would be best (as opposed to Kconfig changes) since it only touches the subarch... Signed-off-by: <Natalie.Protasevich@unisys.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'arch/i386/kernel/mpparse.c')
-rw-r--r--arch/i386/kernel/mpparse.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/i386/kernel/mpparse.c b/arch/i386/kernel/mpparse.c
index e6e2f43db85e..e85e463af7ce 100644
--- a/arch/i386/kernel/mpparse.c
+++ b/arch/i386/kernel/mpparse.c
@@ -828,6 +828,8 @@ void __init find_smp_config (void)
828 smp_scan_config(address, 0x400); 828 smp_scan_config(address, 0x400);
829} 829}
830 830
831int es7000_plat;
832
831/* -------------------------------------------------------------------------- 833/* --------------------------------------------------------------------------
832 ACPI-based MP Configuration 834 ACPI-based MP Configuration
833 -------------------------------------------------------------------------- */ 835 -------------------------------------------------------------------------- */
@@ -1011,8 +1013,6 @@ void __init mp_override_legacy_irq (
1011 return; 1013 return;
1012} 1014}
1013 1015
1014int es7000_plat;
1015
1016void __init mp_config_acpi_legacy_irqs (void) 1016void __init mp_config_acpi_legacy_irqs (void)
1017{ 1017{
1018 struct mpc_config_intsrc intsrc; 1018 struct mpc_config_intsrc intsrc;