3 files changed, 3 insertions, 7 deletions

diff --git a/drivers/Makefile b/drivers/Makefile
index 126a851d5653..784b93c8888d 100644
--- a/drivers/Makefile
+++ b/drivers/Makefile
@@ -8,7 +8,7 @@
 obj-$(CONFIG_PCI)               += pci/
 obj-$(CONFIG_PARISC)            += parisc/
 obj-y                           += video/
-obj-$(CONFIG_ACPI_BOOT)         += acpi/
+obj-$(CONFIG_ACPI)              += acpi/
 # PnP must come after ACPI since it will eventually need to check if acpi
 # was used and do nothing if so
 obj-$(CONFIG_PNP)               += pnp/
diff --git a/drivers/acpi/Kconfig b/drivers/acpi/Kconfig
index 66c60982ba46..14b70c259f3e 100644
--- a/drivers/acpi/Kconfig
+++ b/drivers/acpi/Kconfig
@@ -43,10 +43,6 @@ config ACPI
 
 if ACPI
 
-config ACPI_BOOT
-        bool
-        default y
-
 config ACPI_INTERPRETER
         bool
         default y
@@ -312,7 +308,7 @@ endif	# ACPI_INTERPRETER
 config X86_PM_TIMER
         bool "Power Management Timer Support"
         depends on X86
-        depends on ACPI_BOOT && EXPERIMENTAL
+        depends on EXPERIMENTAL
         depends on !X86_64
         default n
         help
diff --git a/drivers/acpi/Makefile b/drivers/acpi/Makefile
index ad67e8f61e6c..952ab352af9e 100644
--- a/drivers/acpi/Makefile
+++ b/drivers/acpi/Makefile
@@ -15,7 +15,7 @@ EXTRA_CFLAGS	+= $(ACPI_CFLAGS)
 #
 # ACPI Boot-Time Table Parsing
 #
-obj-$(CONFIG_ACPI_BOOT)         += tables.o
+obj-y                           += tables.o
 obj-$(CONFIG_ACPI_INTERPRETER)  += blacklist.o
 
 #