diff options
| author | Len Brown <len.brown@intel.com> | 2008-11-11 21:14:11 -0500 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2008-11-11 21:14:11 -0500 |
| commit | 3e0fe364835cecc8560cf32bb9609f4c56c5d9fa (patch) | |
| tree | be2236bd4f6f16aee24cca5217449dc03a6c1e85 /drivers/acpi/Makefile | |
| parent | e911d27af43e7d28d59a96a4682e8942f0661469 (diff) | |
| parent | 32836259ff25ce97010569706cd33ba94de81d62 (diff) | |
Merge branch 'misc' into release
Diffstat (limited to 'drivers/acpi/Makefile')
| -rw-r--r-- | drivers/acpi/Makefile | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/acpi/Makefile b/drivers/acpi/Makefile index d91c027ece8..fc622316a7d 100644 --- a/drivers/acpi/Makefile +++ b/drivers/acpi/Makefile @@ -39,7 +39,7 @@ obj-y += sleep/ obj-y += bus.o glue.o obj-y += scan.o # Keep EC driver first. Initialization of others depend on it. -obj-$(CONFIG_ACPI_EC) += ec.o +obj-y += ec.o obj-$(CONFIG_ACPI_AC) += ac.o obj-$(CONFIG_ACPI_BATTERY) += battery.o obj-$(CONFIG_ACPI_BUTTON) += button.o @@ -51,7 +51,7 @@ 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-$(CONFIG_ACPI_POWER) += power.o +obj-y += power.o obj-$(CONFIG_ACPI_SYSTEM) += system.o event.o obj-$(CONFIG_ACPI_DEBUG) += debug.o obj-$(CONFIG_ACPI_NUMA) += numa.o |