提交 58c9d61f 编写于 作者: T Tony Camuso 提交者: Corey Minyard

ipmi: put acpi.h with the other headers

Enclosing '#include <linux/acpi.h>' within '#ifdef CONFIG_ACPI' is
unnecessary, since it has its own conditional compile for CONFIG_ACPI.

Commit 0fbcf4af ("ipmi: Convert the IPMI SI ACPI handling to a
platform device") exposed this as a problem for platforms that do not
support ACPI when it introduced a call to ACPI_PTR() macro outside of
the CONFIG_ACPI conditional compile. This would have been perfectly
acceptable if acpi.h were not conditionally excluded for the non-acpi
platform, because the conditional compile within acpi.h defines
ACPI_PTR() to return NULL when compiled for non acpi platforms.
Signed-off-by: NTony Camuso <tcamuso@redhat.com>

Fixed commit reference in header to conform to standard.
Signed-off-by: NCorey Minyard <cminyard@mvista.com>
上级 30e4c9ad
...@@ -68,6 +68,7 @@ ...@@ -68,6 +68,7 @@
#include <linux/of_platform.h> #include <linux/of_platform.h>
#include <linux/of_address.h> #include <linux/of_address.h>
#include <linux/of_irq.h> #include <linux/of_irq.h>
#include <linux/acpi.h>
#ifdef CONFIG_PARISC #ifdef CONFIG_PARISC
#include <asm/hardware.h> /* for register_parisc_driver() stuff */ #include <asm/hardware.h> /* for register_parisc_driver() stuff */
...@@ -2054,8 +2055,6 @@ static int hardcode_find_bmc(void) ...@@ -2054,8 +2055,6 @@ static int hardcode_find_bmc(void)
#ifdef CONFIG_ACPI #ifdef CONFIG_ACPI
#include <linux/acpi.h>
/* /*
* Once we get an ACPI failure, we don't try any more, because we go * 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 * through the tables sequentially. Once we don't find a table, there
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册