Merge branch 'pci/host-keystone' into next
authorBjorn Helgaas <bhelgaas@google.com>
Thu, 7 Sep 2017 18:24:01 +0000 (13:24 -0500)
committerBjorn Helgaas <bhelgaas@google.com>
Thu, 7 Sep 2017 18:24:01 +0000 (13:24 -0500)
commit8f5b3f5b40d1d4e33570ea74a2023695c37c06b2
treede9bf180e2015c87115a44a5592ebbaca3dc0699
parent352948c414d92784a2edb762554d1c682ebd4661
parentda4c4be36dc347b9b7eb0760054caa53e31abcc0
Merge branch 'pci/host-keystone' into next

* pci/host-keystone:
  PCI: keystone: Use PCI_NUM_INTX
  PCI: keystone: Remove duplicate MAX_*_IRQS defs
  PCI: keystone-dw: Remove unused ks_pcie, pci variables
drivers/pci/dwc/pci-keystone.c