]> git.baikalelectronics.ru Git - kernel.git/commit
ipmi: put acpi.h with the other headers
authorTony Camuso <tcamuso@redhat.com>
Tue, 2 Feb 2016 18:57:24 +0000 (13:57 -0500)
committerCorey Minyard <cminyard@mvista.com>
Wed, 3 Feb 2016 16:35:52 +0000 (10:35 -0600)
commitbc2556f29e5de14263aa041c58ca70ca2cd908f3
treeeb7db746d5c16be4e6c059734d88c79e7d7d625c
parent3051a1ed1c5b87e71a489ea70cfac91bd81fdd69
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 4a79d83db666 ("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: Tony Camuso <tcamuso@redhat.com>
Fixed commit reference in header to conform to standard.

Signed-off-by: Corey Minyard <cminyard@mvista.com>
drivers/char/ipmi/ipmi_si_intf.c