]> git.karo-electronics.de Git - linux-beck.git/commitdiff
projects / linux-beck.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 4024660 ba3eb9f)
Merge branch 'pci/host-rcar' into next
authorBjorn Helgaas <bhelgaas@google.com>
Thu, 31 Oct 2013 19:58:49 +0000 (13:58 -0600)
committerBjorn Helgaas <bhelgaas@google.com>
Thu, 31 Oct 2013 19:58:49 +0000 (13:58 -0600)
* pci/host-rcar:
  PCI: Add R-Car Gen2 internal PCI support

1  2 
drivers/pci/host/Kconfig patch | diff1 | diff2 | blob | history
drivers/pci/host/Makefile patch | diff1 | diff2 | blob | history

diff --cc drivers/pci/host/Kconfig
Simple merge
diff --cc drivers/pci/host/Makefile
index 287d6a053dda4b0a2d61dd85e5a0bc19349fee4f,63d972775289c5dd35c8bfa5b21ce87d02eaac7b..13fb3333aa0524458b4427fceef3ca79926bfd04
--- 1/drivers/pci/host/Makefile
--- 2/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
Beck SC1x5 Kernel