From: Bjorn Helgaas <bhelgaas@google.com>
Date: Thu, 31 Oct 2013 19:58:49 +0000 (-0600)
Subject: Merge branch 'pci/host-rcar' into next
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=4efc52a9c22d4795e6960c1baf41e0f7e440682a;p=linux-beck.git

Merge branch 'pci/host-rcar' into next

* pci/host-rcar:
  PCI: Add R-Car Gen2 internal PCI support
---

4efc52a9c22d4795e6960c1baf41e0f7e440682a
diff --cc drivers/pci/host/Makefile
index 287d6a053dda,63d972775289..13fb3333aa05
--- a/drivers/pci/host/Makefile
+++ b/drivers/pci/host/Makefile
@@@ -1,5 -1,5 +1,6 @@@
  obj-$(CONFIG_PCIE_DW) += pcie-designware.o
  obj-$(CONFIG_PCI_EXYNOS) += pci-exynos.o
 +obj-$(CONFIG_PCI_IMX6) += pci-imx6.o
  obj-$(CONFIG_PCI_MVEBU) += pci-mvebu.o
  obj-$(CONFIG_PCI_TEGRA) += pci-tegra.o
+ obj-$(CONFIG_PCI_RCAR_GEN2) += pci-rcar-gen2.o