--- ./arch/i386/kernel/Makefile.bad	Sun Mar  6 17:23:25 2005
+++ ./arch/i386/kernel/Makefile	Sun Mar  6 23:16:02 2005
@@ -46,7 +46,8 @@
 obj-$(CONFIG_SMP)		+= smp.o smpboot.o trampoline.o
 obj-$(CONFIG_KMSGDUMP)		+= kmsgdump.o
 obj-$(CONFIG_X86_LOCAL_APIC)	+= mpparse.o apic.o nmi.o
-obj-$(CONFIG_X86_IO_APIC)	+= io_apic.o earlyquirk.o
+obj-$(CONFIG_X86_IO_APIC)	+= io_apic.o
+obj-$(CONFIG_ACPI)		+= earlyquirk.o
 obj-$(CONFIG_X86_VISWS_APIC)	+= visws_apic.o
 obj-$(CONFIG_EDD)             	+= edd.o
 obj-$(CONFIG_X86_POWERNOW_K6)	+= powernow-k6.o
--- ./include/asm-i386/acpi.h.bad	Sun Mar  6 22:53:19 2005
+++ ./include/asm-i386/acpi.h	Sun Mar  6 23:08:02 2005
@@ -117,6 +117,8 @@
 static inline int acpi_irq_balance_set(char *str) { return 0; }
 #endif
 
+void __init check_acpi_pci(void);
+
 #ifdef CONFIG_ACPI_BOOT 
 extern int acpi_lapic;
 extern int acpi_ioapic;
@@ -124,7 +126,6 @@
 extern int acpi_disabled;
 extern int acpi_ht;
 extern int acpi_skip_timer_override;
-void __init check_acpi_pci(void);
 static inline void disable_acpi(void) 
 { 
 	acpi_disabled = 1;