mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-08-24 01:41:39 +00:00
Fix a compile error on IPMI when ACPI is disabled.
-----BEGIN PGP SIGNATURE----- Version: GnuPG v1 iEYEABECAAYFAlayLO0ACgkQIXnXXONXERcDKwCeMsgPWCtDA8tIOawNY9MhJFsE F30AoJFCqUny4Sc/T6/+bBB5l3zPTlUy =Zzrb -----END PGP SIGNATURE----- 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
This commit is contained in:
commit
d5bfb96bda
1 changed files with 1 additions and 2 deletions
|
@ -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
|
||||
|
|
Loading…
Reference in a new issue