Commit 79a947bd authored by Thorsten Blum's avatar Thorsten Blum Committed by Rafael J. Wysocki
Browse files

ACPI: NUMA: Consolidate header includes 



The header file acpi/acpi_numa.h is included whether CONFIG_ACPI is
defined or not.

Include it only once before the #ifdef/#else/#endif preprocessor
directives and fix the following make includecheck warning:

	acpi/acpi_numa.h is included more than once

Signed-off-by: default avatarThorsten Blum <thorsten.blum@toblux.com>
Signed-off-by: default avatarRafael J. Wysocki <rafael.j.wysocki@intel.com>
parent 74c2a2ae

include/linux/acpi.h

+1 −3
Original line number Diff line number Diff line
@@ -24,6 +24,7 @@ struct irq_domain_ops; 
#define _LINUX

#endif

#include <acpi/acpi.h>

#include <acpi/acpi_numa.h>



#ifdef	CONFIG_ACPI
@@ -35,7 +36,6 @@ struct irq_domain_ops; 


#include <acpi/acpi_bus.h>

#include <acpi/acpi_drivers.h>

#include <acpi/acpi_numa.h>

#include <acpi/acpi_io.h>

#include <asm/acpi.h>
@@ -777,8 +777,6 @@ const char *acpi_get_subsystem_id(acpi_handle handle); 
#define acpi_dev_uid_match(adev, uid2)			(adev && false)

#define acpi_dev_hid_uid_match(adev, hid2, uid2)	(adev && false)



#include <acpi/acpi_numa.h>



struct fwnode_handle;



static inline bool acpi_dev_found(const char *hid)