summaryrefslogtreecommitdiffstats
path: root/drivers/Makefile
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2016-10-23 15:56:23 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2016-10-23 15:56:23 -0700
commit5766e9d25f41d79a0bb99e44a4408d00236dc3c7 (patch)
tree25f3beda46187f311597ffa83217771aeb212396 /drivers/Makefile
parent0c2b6dc4fd4fa13796b319aae969a009f03222c6 (diff)
parentbd85f4b37ddf2da22ccf5b29d264b2459b6722df (diff)
downloadop-kernel-dev-5766e9d25f41d79a0bb99e44a4408d00236dc3c7.zip
op-kernel-dev-5766e9d25f41d79a0bb99e44a4408d00236dc3c7.tar.gz
Merge tag 'for-linus-4.9-2' of git://git.code.sf.net/p/openipmi/linux-ipmi
Pull IPMI updates from Corey Minyard: "A small bug fix and a new driver for acting as an IPMI device. I was on vacation during the merge window (a long vacation) but this is a bug fix that should go in and a new driver that shouldn't hurt anything. This has been in linux-next for a month or so" * tag 'for-linus-4.9-2' of git://git.code.sf.net/p/openipmi/linux-ipmi: ipmi: fix crash on reading version from proc after unregisted bmc ipmi/bt-bmc: remove redundant return value check of platform_get_resource() ipmi/bt-bmc: add a dependency on ARCH_ASPEED ipmi: Fix ioremap error handling in bt-bmc ipmi: add an Aspeed BT IPMI BMC driver
Diffstat (limited to 'drivers/Makefile')
-rw-r--r--drivers/Makefile2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/Makefile b/drivers/Makefile
index f0afdfb..194d20b 100644
--- a/drivers/Makefile
+++ b/drivers/Makefile
@@ -21,7 +21,7 @@ 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-y += char/ipmi/
obj-$(CONFIG_ACPI) += acpi/
obj-$(CONFIG_SFI) += sfi/
OpenPOWER on IntegriCloud