Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d5bfb96b authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents 86270c8d 58c9d61f

drivers/char/ipmi/ipmi_si_intf.c

+1 −2
Original line number Diff line number Diff line
@@ -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