From 6ec407df24eb2b1e6bd0fa0cb1bdb2d42a70f101 Mon Sep 17 00:00:00 2001
From: Matthew Garrett <mjg@redhat.com>
Date: Tue, 16 Oct 2012 15:53:38 -0500
Subject: [PATCH] --- yaml --- r: 334355 b: refs/heads/master c:
 061475b65c126454aaaaddcbd40e7118424fc860 h: refs/heads/master i:   334353:
 be758961209230e5da017e0505a5eedc9de287fe   334351:
 46d6a8d4fd3115a1a1043212d5d4999aaba1ebd3 v: v3

---
 [refs]                      | 2 +-
 trunk/drivers/Makefile      | 4 ++++
 trunk/drivers/char/Makefile | 1 -
 3 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index ecaa215e33f6..30da9145fe93 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 4033741ff9f727fbf5efb9337c826703534d49b7
+refs/heads/master: 061475b65c126454aaaaddcbd40e7118424fc860
diff --git a/trunk/drivers/Makefile b/trunk/drivers/Makefile
index 03da5b663aef..a16a8d001ae0 100644
--- a/trunk/drivers/Makefile
+++ b/trunk/drivers/Makefile
@@ -17,6 +17,10 @@ obj-$(CONFIG_PARISC)		+= parisc/
 obj-$(CONFIG_RAPIDIO)		+= rapidio/
 obj-y				+= video/
 obj-y				+= idle/
+
+# IPMI must come before ACPI in order to provide IPMI opregion support
+obj-$(CONFIG_IPMI_HANDLER)	+= char/ipmi/
+
 obj-$(CONFIG_ACPI)		+= acpi/
 obj-$(CONFIG_SFI)		+= sfi/
 # PnP must come after ACPI since it will eventually need to check if acpi
diff --git a/trunk/drivers/char/Makefile b/trunk/drivers/char/Makefile
index d0b27a39f1d4..7ff1d0d208a7 100644
--- a/trunk/drivers/char/Makefile
+++ b/trunk/drivers/char/Makefile
@@ -52,7 +52,6 @@ obj-$(CONFIG_TELCLOCK)		+= tlclk.o
 obj-$(CONFIG_MWAVE)		+= mwave/
 obj-$(CONFIG_AGP)		+= agp/
 obj-$(CONFIG_PCMCIA)		+= pcmcia/
-obj-$(CONFIG_IPMI_HANDLER)	+= ipmi/
 
 obj-$(CONFIG_HANGCHECK_TIMER)	+= hangcheck-timer.o
 obj-$(CONFIG_TCG_TPM)		+= tpm/