diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2016-02-03 19:04:58 +0100 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2016-02-03 19:04:58 +0100 |
| commit | d5bfb96bdad3588961f49a6eff89a625fbaa12bf (patch) | |
| tree | 80e88fe85ea55785e2a5a2bdc1f9813ab3994153 | |
| parent | Merge tag 'devicetree-fixes-for-4.5' of git://git.kernel.org/pub/scm/linux/ke... (diff) | |
| parent | ipmi: put acpi.h with the other headers (diff) | |
| download | linux-d5bfb96bdad3588961f49a6eff89a625fbaa12bf.tar.xz linux-d5bfb96bdad3588961f49a6eff89a625fbaa12bf.zip | |
Merge tag 'for-linus-4.5-2' of git://git.code.sf.net/p/openipmi/linux-ipmi
Pull IPMI fix from Corey Minyard:
"Fix a compile error on IPMI when ACPI is disabled"
* tag 'for-linus-4.5-2' of git://git.code.sf.net/p/openipmi/linux-ipmi:
ipmi: put acpi.h with the other headers
| -rw-r--r-- | drivers/char/ipmi/ipmi_si_intf.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/char/ipmi/ipmi_si_intf.c b/drivers/char/ipmi/ipmi_si_intf.c index 9fda22e3387e..7fddd8696211 100644 --- a/drivers/char/ipmi/ipmi_si_intf.c +++ b/drivers/char/ipmi/ipmi_si_intf.c @@ -68,6 +68,7 @@ #include <linux/of_platform.h> #include <linux/of_address.h> #include <linux/of_irq.h> +#include <linux/acpi.h> #ifdef CONFIG_PARISC #include <asm/hardware.h> /* for register_parisc_driver() stuff */ @@ -2054,8 +2055,6 @@ static int hardcode_find_bmc(void) #ifdef CONFIG_ACPI -#include <linux/acpi.h> - /* * Once we get an ACPI failure, we don't try any more, because we go * through the tables sequentially. Once we don't find a table, there |