diff options
author | Len Brown <len.brown@intel.com> | 2008-02-07 03:19:43 -0500 |
---|---|---|
committer | Len Brown <len.brown@intel.com> | 2008-02-07 03:19:43 -0500 |
commit | 060195500e0347a6ba8ea89739a9898961eb6f2b (patch) | |
tree | 5afba4e8daae642d33b7a4daa97d63c54776b786 /drivers/acpi/Makefile | |
parent | 26b6f2236615649a0ae6a0de2e9e71a2f9ffeba7 (diff) | |
parent | dd8cd7793781c87be47bbfee65efa3fb5110f898 (diff) |
Merge branches 'release' and 'wmi-2.6.25' into release
Diffstat (limited to 'drivers/acpi/Makefile')
-rw-r--r-- | drivers/acpi/Makefile | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/acpi/Makefile b/drivers/acpi/Makefile index 456446f9007..f29812a8653 100644 --- a/drivers/acpi/Makefile +++ b/drivers/acpi/Makefile @@ -55,6 +55,7 @@ obj-$(CONFIG_ACPI_THERMAL) += thermal.o obj-$(CONFIG_ACPI_SYSTEM) += system.o event.o obj-$(CONFIG_ACPI_DEBUG) += debug.o obj-$(CONFIG_ACPI_NUMA) += numa.o +obj-$(CONFIG_ACPI_WMI) += wmi.o obj-$(CONFIG_ACPI_ASUS) += asus_acpi.o obj-$(CONFIG_ACPI_TOSHIBA) += toshiba_acpi.o obj-$(CONFIG_ACPI_HOTPLUG_MEMORY) += acpi_memhotplug.o |