ACPI -- CONFIG_ACPI_HT

arch/i386/kernel/Makefile

@@ -11,7 +11,7 @@ obj-y	:= process.o semaphore.o signal.o entry.o traps.o irq.o vm86.o \
 
 obj-y				+= cpu/
 obj-y				+= timers/
-obj-$(CONFIG_ACPI)		+= acpi/
+obj-$(CONFIG_ACPI_BOOT)		+= acpi/
 obj-$(CONFIG_X86_BIOS_REBOOT)	+= reboot.o
 obj-$(CONFIG_MCA)		+= mca.o
 obj-$(CONFIG_X86_MSR)		+= msr.o

include/linux/acpi.h

@@ -37,7 +37,7 @@
 #include <asm/acpi.h>
 
 
-#ifdef CONFIG_ACPI
+#ifdef CONFIG_ACPI_BOOT
 
 enum acpi_irq_model_id {
 	ACPI_IRQ_MODEL_PIC = 0,
@@ -369,11 +369,11 @@ void acpi_numa_arch_fixup(void);
 
 extern int acpi_mp_config;
 
-#else
+#else	/*!CONFIG_ACPI_BOOT*/
 
 #define acpi_mp_config	0
 
-#endif
+#endif 	/*!CONFIG_ACPI_BOOT*/
 
 
 #ifdef CONFIG_ACPI_PCI