diff options
| author | Len Brown <len.brown@intel.com> | 2005-08-24 12:07:20 -0400 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2005-08-24 12:08:54 -0400 |
| commit | 888ba6c62bc61a995d283977eb3a6cbafd6f4ac6 (patch) | |
| tree | 2a1614a7c63460e98f55ac5905f3a4be679138f1 /arch/i386/kernel/Makefile | |
| parent | 84ffa747520edd4556b136bdfc9df9eb1673ce12 (diff) | |
[ACPI] delete CONFIG_ACPI_BOOT
it has been a synonym for CONFIG_ACPI since 2.6.12
Signed-off-by: Len Brown <len.brown@intel.com>
Diffstat (limited to 'arch/i386/kernel/Makefile')
| -rw-r--r-- | arch/i386/kernel/Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/i386/kernel/Makefile b/arch/i386/kernel/Makefile index 4cc83b322b36..c52b4fad011b 100644 --- a/arch/i386/kernel/Makefile +++ b/arch/i386/kernel/Makefile | |||
| @@ -11,7 +11,7 @@ obj-y := process.o semaphore.o signal.o entry.o traps.o irq.o vm86.o \ | |||
| 11 | 11 | ||
| 12 | obj-y += cpu/ | 12 | obj-y += cpu/ |
| 13 | obj-y += timers/ | 13 | obj-y += timers/ |
| 14 | obj-$(CONFIG_ACPI_BOOT) += acpi/ | 14 | obj-$(CONFIG_ACPI) += acpi/ |
| 15 | obj-$(CONFIG_X86_BIOS_REBOOT) += reboot.o | 15 | obj-$(CONFIG_X86_BIOS_REBOOT) += reboot.o |
| 16 | obj-$(CONFIG_MCA) += mca.o | 16 | obj-$(CONFIG_MCA) += mca.o |
| 17 | obj-$(CONFIG_X86_MSR) += msr.o | 17 | obj-$(CONFIG_X86_MSR) += msr.o |