summaryrefslogtreecommitdiffstats
path: root/drivers/Makefile
diff options
context:
space:
mode:
authorMatthew Garrett2012-10-16 22:53:38 +0200
committerLinus Torvalds2012-10-17 03:07:12 +0200
commit061475b65c126454aaaaddcbd40e7118424fc860 (patch)
tree7f335c37741127702ee902c166cfb8b3111e2fb8 /drivers/Makefile
parentACPI: Reorder IPMI driver before any other ACPI drivers (diff)
downloadkernel-qcow2-linux-061475b65c126454aaaaddcbd40e7118424fc860.tar.gz
kernel-qcow2-linux-061475b65c126454aaaaddcbd40e7118424fc860.tar.xz
kernel-qcow2-linux-061475b65c126454aaaaddcbd40e7118424fc860.zip
IPMI: Change link order
IPMI must be initialised before ACPI in order to ensure that any IPMI services are available before ACPI driver initialisation attempts to use any IPMI operation regions. Signed-off-by: Matthew Garrett <mjg@redhat.com> Signed-off-by: Corey Minyard <cminyard@mvista.com> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'drivers/Makefile')
-rw-r--r--drivers/Makefile4
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/Makefile b/drivers/Makefile
index 03da5b663aef..a16a8d001ae0 100644
--- a/drivers/Makefile
+++ b/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