diff options
| author | Bjorn Helgaas <bjorn.helgaas@hp.com> | 2009-03-24 16:50:24 -0600 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2009-03-27 12:51:41 -0400 |
| commit | 018f452e9d9d0cb5c3e8d33fd94dc6cd3c520a8f (patch) | |
| tree | d11ed659b410ce9eae3f206aa104cdff6d988b60 | |
| parent | 201b8c655f7a48563f6a0b66f9e388460a1ea611 (diff) | |
| download | linux-3.10-018f452e9d9d0cb5c3e8d33fd94dc6cd3c520a8f.tar.gz linux-3.10-018f452e9d9d0cb5c3e8d33fd94dc6cd3c520a8f.tar.bz2 linux-3.10-018f452e9d9d0cb5c3e8d33fd94dc6cd3c520a8f.zip | |
ACPI: tidy up makefile
This patch removes the suggestion that ec.o link order is important,
because it doesn't matter since acpi_ec_init() is no longer an initcall.
And it puts together most of the core modules that are not configurable.
Signed-off-by: Bjorn Helgaas <bjorn.helgaas@hp.com>
Signed-off-by: Len Brown <len.brown@intel.com>
| -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 |