summaryrefslogtreecommitdiffstats
path: root/drivers/acpi/Makefile
diff options
context:
space:
mode:
authorLen Brown <len.brown@intel.com>2011-01-12 05:03:13 -0500
committerLen Brown <len.brown@intel.com>2011-01-12 05:03:13 -0500
commit4b63bd35eb4e7959b0f7be17634689d34311524b (patch)
tree2dad174e4ef8cbe5ef86541a8496b5f97dcf35d1 /drivers/acpi/Makefile
parent03b6e6e58d9dd5f3068288653810db3c15fde929 (diff)
parente92b297cc72ade7a58eaec7e01c906d856f8ab6e (diff)
downloadlinux-4b63bd35eb4e7959b0f7be17634689d34311524b.tar.bz2
Merge branch 'ipmi' into release
Diffstat (limited to 'drivers/acpi/Makefile')
-rw-r--r--drivers/acpi/Makefile1
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/acpi/Makefile b/drivers/acpi/Makefile
index 9cc9f2c4da79..d113fa5100b2 100644
--- a/drivers/acpi/Makefile
+++ b/drivers/acpi/Makefile
@@ -69,5 +69,6 @@ processor-y += processor_idle.o processor_thermal.o
processor-$(CONFIG_CPU_FREQ) += processor_perflib.o
obj-$(CONFIG_ACPI_PROCESSOR_AGGREGATOR) += acpi_pad.o
+obj-$(CONFIG_ACPI_IPMI) += acpi_ipmi.o
obj-$(CONFIG_ACPI_APEI) += apei/