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/x86_64/kernel/Makefile | |
parent | 84ffa747520edd4556b136bdfc9df9eb1673ce12 (diff) | |
download | kernel_samsung_smdk4412-888ba6c62bc61a995d283977eb3a6cbafd6f4ac6.zip kernel_samsung_smdk4412-888ba6c62bc61a995d283977eb3a6cbafd6f4ac6.tar.gz kernel_samsung_smdk4412-888ba6c62bc61a995d283977eb3a6cbafd6f4ac6.tar.bz2 |
[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/x86_64/kernel/Makefile')
-rw-r--r-- | arch/x86_64/kernel/Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86_64/kernel/Makefile b/arch/x86_64/kernel/Makefile index 48f9e2c..0296ca6 100644 --- a/arch/x86_64/kernel/Makefile +++ b/arch/x86_64/kernel/Makefile @@ -12,7 +12,7 @@ obj-y := process.o semaphore.o signal.o entry.o traps.o irq.o \ obj-$(CONFIG_X86_MCE) += mce.o obj-$(CONFIG_X86_MCE_INTEL) += mce_intel.o obj-$(CONFIG_MTRR) += ../../i386/kernel/cpu/mtrr/ -obj-$(CONFIG_ACPI_BOOT) += acpi/ +obj-$(CONFIG_ACPI) += acpi/ obj-$(CONFIG_X86_MSR) += msr.o obj-$(CONFIG_MICROCODE) += microcode.o obj-$(CONFIG_X86_CPUID) += cpuid.o |