Commit f826afe5 authored by Bjorn Helgaas's avatar Bjorn Helgaas
Browse files

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
parents e4d741e9 8610e98f

drivers/pci/controller/cadence/pci-j721e.c

+0 −1
Original line number Diff line number Diff line
@@ -15,7 +15,6 @@ 
#include <linux/mfd/syscon.h>

#include <linux/of.h>

#include <linux/of_device.h>

#include <linux/of_irq.h>

#include <linux/pci.h>

#include <linux/pm_runtime.h>

#include <linux/regmap.h>

drivers/pci/controller/dwc/pci-layerscape.c

+0 −1
Original line number Diff line number Diff line
@@ -13,7 +13,6 @@ 
#include <linux/init.h>

#include <linux/of_pci.h>

#include <linux/of_platform.h>

#include <linux/of_irq.h>

#include <linux/of_address.h>

#include <linux/pci.h>

#include <linux/platform_device.h>

drivers/pci/controller/dwc/pcie-armada8k.c

+0 −1
Original line number Diff line number Diff line
@@ -21,7 +21,6 @@ 
#include <linux/platform_device.h>

#include <linux/resource.h>

#include <linux/of_pci.h>

#include <linux/of_irq.h>



#include "pcie-designware.h"

drivers/pci/controller/dwc/pcie-tegra194.c

+0 −1
Original line number Diff line number Diff line
@@ -21,7 +21,6 @@ 
#include <linux/of.h>

#include <linux/of_device.h>

#include <linux/of_gpio.h>

#include <linux/of_irq.h>

#include <linux/of_pci.h>

#include <linux/pci.h>

#include <linux/phy/phy.h>

drivers/pci/controller/pci-ftpci100.c

+1 −1
Original line number Diff line number Diff line
@@ -553,7 +553,7 @@ static const struct of_device_id faraday_pci_of_match[] = { 
static struct platform_driver faraday_pci_driver = {

	.driver = {

		.name = "ftpci100",

		.of_match_table = of_match_ptr(faraday_pci_of_match),

		.of_match_table = faraday_pci_of_match,

		.suppress_bind_attrs = true,

	},

	.probe  = faraday_pci_probe,