diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-10-17 05:08:21 +0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-10-17 05:08:21 +0400 |
| commit | cba8d1cb6608bba49803ddceef1ff889aa2ed316 (patch) | |
| tree | 34fceea3ab0f777df2e72729f393661e7001cee1 /drivers/Makefile | |
| parent | c772fc26f8938dd526a411a6162db95a33f56028 (diff) | |
| parent | a6c16c2803089f032f86fe15e952176c0713d6e3 (diff) | |
| download | linux-cba8d1cb6608bba49803ddceef1ff889aa2ed316.tar.xz | |
Merge branch 'ipmi' (IPMI patches from Corey Minyard)
Merge emailed patches from Corey Minyard:
"Remove some bogus docs, Fix ACPI/IPMI interactions, fix some warnings,
and add register spacing detection for PCI interfaces."
* ipmi:
IPMI: Detect register spacing on PCI interfaces
IPMI: Fix some uninitialized warning
IPMI: Change link order
ACPI: Reorder IPMI driver before any other ACPI drivers
IPMI: Remove SMBus driver info from the docs
Diffstat (limited to 'drivers/Makefile')
| -rw-r--r-- | drivers/Makefile | 4 |
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 |