From 894c67438a31b431a1cf50b26c9579222bdc36ae Mon Sep 17 00:00:00 2001
From: Matthew Garrett <mjg@redhat.com>
Date: Tue, 16 Oct 2012 15:53:37 -0500
Subject: [PATCH] --- yaml --- r: 334354 b: refs/heads/master c:
 4033741ff9f727fbf5efb9337c826703534d49b7 h: refs/heads/master v: v3

---
 [refs]                      | 2 +-
 trunk/drivers/acpi/Makefile | 5 ++++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index de9feaaff85c..ecaa215e33f6 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d1bdc40b3389b1165e705c7794441417ed2a43bd
+refs/heads/master: 4033741ff9f727fbf5efb9337c826703534d49b7
diff --git a/trunk/drivers/acpi/Makefile b/trunk/drivers/acpi/Makefile
index 47199e2a9130..82422fe90f81 100644
--- a/trunk/drivers/acpi/Makefile
+++ b/trunk/drivers/acpi/Makefile
@@ -47,6 +47,10 @@ acpi-y				+= video_detect.o
 endif
 
 # These are (potentially) separate modules
+
+# IPMI may be used by other drivers, so it has to initialise before them
+obj-$(CONFIG_ACPI_IPMI)		+= acpi_ipmi.o
+
 obj-$(CONFIG_ACPI_AC) 		+= ac.o
 obj-$(CONFIG_ACPI_BUTTON)	+= button.o
 obj-$(CONFIG_ACPI_FAN)		+= fan.o
@@ -70,6 +74,5 @@ 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/