diff options
| author | Natalie.Protasevich@unisys.com <Natalie.Protasevich@unisys.com> | 2006-03-23 02:59:36 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-03-23 07:38:04 -0800 |
| commit | e5428ede94179ddccaa56308e0f194fa299edbb4 (patch) | |
| tree | baba6926b3176442d9bf8cdcc86a5ed30bac22ba /arch/i386/kernel | |
| parent | 54a20f8c5d778ed3603130de4b92f64405228611 (diff) | |
| download | linux-stable-e5428ede94179ddccaa56308e0f194fa299edbb4.tar.gz linux-stable-e5428ede94179ddccaa56308e0f194fa299edbb4.tar.bz2 linux-stable-e5428ede94179ddccaa56308e0f194fa299edbb4.zip | |
[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')
| -rw-r--r-- | arch/i386/kernel/mpparse.c | 4 |
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) smp_scan_config(address, 0x400); } +int es7000_plat; + /* -------------------------------------------------------------------------- ACPI-based MP Configuration -------------------------------------------------------------------------- */ @@ -1011,8 +1013,6 @@ void __init mp_override_legacy_irq ( return; } -int es7000_plat; - void __init mp_config_acpi_legacy_irqs (void) { struct mpc_config_intsrc intsrc; |