Skip to content

Commit 4516662

Browse files
robherringrafaeljw
authored andcommitted
ACPI: Replace irqdomain.h include with struct declarations
linux/acpi.h includes irqdomain.h which includes of.h. Break the include chain by replacing the irqdomain include with forward declarations for struct irq_domain and irq_domain_ops which is sufficient for acpi.h. of.h also includes mod_devicetable.h which many drivers implicitly depend on. As acpi.h already includes it, just move it out of the '#ifdef CONFIG_ACPI'. Reviewed-by: Jacob Keller <jacob.e.keller@intel.com> Reviewed-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> Signed-off-by: Rob Herring <robh@kernel.org> Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
1 parent 2febc5d commit 4516662

1 file changed

Lines changed: 4 additions & 2 deletions

File tree

include/linux/acpi.h

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,12 +10,15 @@
1010

1111
#include <linux/errno.h>
1212
#include <linux/ioport.h> /* for struct resource */
13-
#include <linux/irqdomain.h>
1413
#include <linux/resource_ext.h>
1514
#include <linux/device.h>
15+
#include <linux/mod_devicetable.h>
1616
#include <linux/property.h>
1717
#include <linux/uuid.h>
1818

19+
struct irq_domain;
20+
struct irq_domain_ops;
21+
1922
#ifndef _LINUX
2023
#define _LINUX
2124
#endif
@@ -24,7 +27,6 @@
2427
#ifdef CONFIG_ACPI
2528

2629
#include <linux/list.h>
27-
#include <linux/mod_devicetable.h>
2830
#include <linux/dynamic_debug.h>
2931
#include <linux/module.h>
3032
#include <linux/mutex.h>

0 commit comments

Comments
 (0)