Commit 58c9d61f authored Feb 02, 2016 by Tony Camuso Committed by Corey Minyard Feb 03, 2016

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: Tony Camuso <tcamuso@redhat.com>

Fixed commit reference in header to conform to standard.

Signed-off-by: Corey Minyard <cminyard@mvista.com>

parent 30e4c9ad

drivers/char/ipmi/ipmi_si_intf.c

+1 −2

Original line number	Original line	Diff line number	Diff line
	@@ -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)

	#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