From: john stultz Backout pmtmr_ioport changes to avoid conflicting w/ x86-64 Signed-off-by: John Stultz Signed-off-by: Andrew Morton --- arch/i386/kernel/acpi/boot.c | 2 +- 1 files changed, 1 insertion(+), 1 deletion(-) diff -puN arch/i386/kernel/acpi/boot.c~time-i386-conversion-part-3-backout-pmtmr-changes arch/i386/kernel/acpi/boot.c --- devel/arch/i386/kernel/acpi/boot.c~time-i386-conversion-part-3-backout-pmtmr-changes 2006-03-11 02:47:11.000000000 -0800 +++ devel-akpm/arch/i386/kernel/acpi/boot.c 2006-03-11 02:47:11.000000000 -0800 @@ -684,7 +684,7 @@ static int __init acpi_parse_hpet(unsign #endif #ifdef CONFIG_X86_PM_TIMER -u32 pmtmr_ioport; +extern u32 pmtmr_ioport; #endif static int __init acpi_parse_fadt(unsigned long phys, unsigned long size) _