summaryrefslogtreecommitdiffstats
path: root/arch/x86_64/kernel/acpi
diff options
context:
space:
mode:
authorLen Brown <len.brown@intel.com>2005-08-24 18:07:20 +0200
committerLen Brown <len.brown@intel.com>2005-08-24 18:08:54 +0200
commit888ba6c62bc61a995d283977eb3a6cbafd6f4ac6 (patch)
tree2a1614a7c63460e98f55ac5905f3a4be679138f1 /arch/x86_64/kernel/acpi
parentMerge from-linus to-akpm (diff)
downloadlinux-888ba6c62bc61a995d283977eb3a6cbafd6f4ac6.tar.xz
linux-888ba6c62bc61a995d283977eb3a6cbafd6f4ac6.zip
[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/acpi')
-rw-r--r--arch/x86_64/kernel/acpi/Makefile4
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/x86_64/kernel/acpi/Makefile b/arch/x86_64/kernel/acpi/Makefile
index d2c2ee5f9a88..7da9ace890bd 100644
--- a/arch/x86_64/kernel/acpi/Makefile
+++ b/arch/x86_64/kernel/acpi/Makefile
@@ -1,3 +1,3 @@
-obj-$(CONFIG_ACPI_BOOT) := boot.o
-boot-$(CONFIG_ACPI_BOOT) := ../../../i386/kernel/acpi/boot.o
+obj-y := boot.o
+boot-y := ../../../i386/kernel/acpi/boot.o
obj-$(CONFIG_ACPI_SLEEP) += sleep.o wakeup.o