diff options
author | Len Brown <len.brown@intel.com> | 2009-04-05 01:38:31 -0400 |
---|---|---|
committer | Len Brown <len.brown@intel.com> | 2009-04-05 01:38:31 -0400 |
commit | 9a38f4eec57cc5104b6a85bc6d0a91b268fbe803 (patch) | |
tree | da01b5dd92d4076878003a8886fc2c9265e578f5 /drivers/acpi/Makefile | |
parent | 67dc092187626ac55a60877485f78bc291cbfa81 (diff) | |
parent | 018f452e9d9d0cb5c3e8d33fd94dc6cd3c520a8f (diff) |
Merge branch 'bjorn-initcall-cleanup' into release
Diffstat (limited to 'drivers/acpi/Makefile')
-rw-r--r-- | drivers/acpi/Makefile | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/drivers/acpi/Makefile b/drivers/acpi/Makefile index b130ea0d075..61675e21fba 100644 --- a/drivers/acpi/Makefile +++ b/drivers/acpi/Makefile @@ -32,10 +32,8 @@ ifdef CONFIG_CPU_FREQ processor-objs += processor_perflib.o endif -obj-y += bus.o glue.o -obj-y += scan.o -# Keep EC driver first. Initialization of others depend on it. -obj-y += ec.o +obj-y += bus.o glue.o scan.o ec.o \ + power.o system.o event.o obj-$(CONFIG_ACPI_AC) += ac.o obj-$(CONFIG_ACPI_BATTERY) += battery.o obj-$(CONFIG_ACPI_BUTTON) += button.o @@ -51,8 +49,6 @@ obj-$(CONFIG_ACPI_PCI_SLOT) += pci_slot.o obj-$(CONFIG_ACPI_PROCESSOR) += processor.o obj-$(CONFIG_ACPI_CONTAINER) += container.o obj-$(CONFIG_ACPI_THERMAL) += thermal.o -obj-y += power.o -obj-y += system.o event.o obj-$(CONFIG_ACPI_DEBUG) += debug.o obj-$(CONFIG_ACPI_NUMA) += numa.o obj-$(CONFIG_ACPI_HOTPLUG_MEMORY) += acpi_memhotplug.o |