From: Bjorn Helgaas <bhelgaas@google.com>
Date: Sat, 10 Dec 2022 16:36:52 +0000 (-0600)
Subject: Merge branch 'pci/kbuild'
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=f826afe5eae856b3834cbc65db6178cccd4a3142;p=linux.git

Merge branch 'pci/kbuild'

- Remove unnecessary <linux/of_irq.h> includes (Bjorn Helgaas)

* pci/kbuild:
  PCI: Drop of_match_ptr() to avoid unused variables
  PCI: Remove unnecessary <linux/of_irq.h> includes
  PCI: xgene-msi: Include <linux/irqdomain.h> explicitly
  PCI: mvebu: Include <linux/irqdomain.h> explicitly
  PCI: microchip: Include <linux/irqdomain.h> explicitly
  PCI: altera-msi: Include <linux/irqdomain.h> explicitly

# Conflicts:
#	drivers/pci/controller/pci-mvebu.c
---

f826afe5eae856b3834cbc65db6178cccd4a3142
diff --cc drivers/pci/controller/pci-mvebu.c
index b12e128fc5d76,73db99035c2b7..1dc209f6f53ae
--- a/drivers/pci/controller/pci-mvebu.c
+++ b/drivers/pci/controller/pci-mvebu.c
@@@ -11,9 -11,9 +11,10 @@@
  #include <linux/bitfield.h>
  #include <linux/clk.h>
  #include <linux/delay.h>
 -#include <linux/gpio.h>
 +#include <linux/gpio/consumer.h>
  #include <linux/init.h>
 +#include <linux/irqchip/chained_irq.h>
+ #include <linux/irqdomain.h>
  #include <linux/mbus.h>
  #include <linux/slab.h>
  #include <linux/platform_device.h>