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

diff --cc drivers/pci/controller/Kconfig
Simple merge

diff --cc drivers/pci/controller/Makefile
index b85fcd5,b3a7912..e4559f2
--- 1/drivers/pci/controller/Makefile
--- 2/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