From: Bjorn Helgaas <bhelgaas@google.com>
Date: Wed, 24 Feb 2021 20:59:25 +0000 (-0600)
Subject: Merge branch 'remotes/lorenzo/pci/tango'
X-Git-Tag: v5.12-rc1~37^2~2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=0a437c50f896cecff8fa603eab9c39da9aeb90a4;p=thirdparty%2Fkernel%2Flinux.git

Merge branch 'remotes/lorenzo/pci/tango'

- Remove tango host controller driver (Arnd Bergmann)

* remotes/lorenzo/pci/tango:
  PCI: Remove tango host controller driver

# Conflicts:
#	drivers/pci/controller/Makefile
---

0a437c50f896cecff8fa603eab9c39da9aeb90a4
diff --cc drivers/pci/controller/Makefile
index b85fcd574ff68,b3a7912f8a5c9..e4559f2182f2f
--- a/drivers/pci/controller/Makefile
+++ b/drivers/pci/controller/Makefile
@@@ -27,8 -27,6 +27,7 @@@ obj-$(CONFIG_PCIE_ROCKCHIP) += pcie-roc
  obj-$(CONFIG_PCIE_ROCKCHIP_EP) += pcie-rockchip-ep.o
  obj-$(CONFIG_PCIE_ROCKCHIP_HOST) += pcie-rockchip-host.o
  obj-$(CONFIG_PCIE_MEDIATEK) += pcie-mediatek.o
- obj-$(CONFIG_PCIE_TANGO_SMP8759) += pcie-tango.o
 +obj-$(CONFIG_PCIE_MICROCHIP_HOST) += pcie-microchip-host.o
  obj-$(CONFIG_VMD) += vmd.o
  obj-$(CONFIG_PCIE_BRCMSTB) += pcie-brcmstb.o
  obj-$(CONFIG_PCI_LOONGSON) += pci-loongson.o