Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
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
+1
-2
+1
-2
drivers/char/ipmi/ipmi_si_intf.c
+1
-2
drivers/char/ipmi/ipmi_si_intf.c
···
68
68
#include <linux/of_platform.h>
69
69
#include <linux/of_address.h>
70
70
#include <linux/of_irq.h>
71
+
#include <linux/acpi.h>
71
72
72
73
#ifdef CONFIG_PARISC
73
74
#include <asm/hardware.h> /* for register_parisc_driver() stuff */
···
2054
2053
}
2055
2054
2056
2055
#ifdef CONFIG_ACPI
2057
-
2058
-
#include <linux/acpi.h>
2059
2056
2060
2057
/*
2061
2058
* Once we get an ACPI failure, we don't try any more, because we go