From: Olof Johansson Date: Sat, 1 Jun 2013 06:13:24 +0000 (-0700) Subject: Merge tag 'pcie-3.11-2' of git://git.infradead.org/users/jcooper/linux into next/soc X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=a640874bb6596f09160b1f39699618f635465e12;p=linux-beck.git Merge tag 'pcie-3.11-2' of git://git.infradead.org/users/jcooper/linux into next/soc PCI-e driver for mvebu. * tag 'pcie-3.11-2' of git://git.infradead.org/users/jcooper/linux: pci: mvebu: fix return value check in mvebu_pcie_probe() arm: mvebu: PCIe support is now available on mvebu pci: PCIe driver for Marvell Armada 370/XP systems clk: mvebu: add more PCIe clocks for Armada XP clk: mvebu: create parent-child relation for PCIe clocks on Armada 370 of/pci: Add of_pci_parse_bus_range() function of/pci: Add of_pci_get_devfn() function of/pci: Provide support for parsing PCI DT ranges property Signed-off-by: Olof Johansson --- a640874bb6596f09160b1f39699618f635465e12 diff --cc arch/arm/mach-mvebu/Kconfig index 80a8bcacd9d5,381062d90c1d..fb827ac9d906 --- a/arch/arm/mach-mvebu/Kconfig +++ b/arch/arm/mach-mvebu/Kconfig @@@ -15,7 -15,8 +15,9 @@@ config ARCH_MVEB select MVEBU_CLK_GATING select MVEBU_MBUS select ZONE_DMA if ARM_LPAE + select ARCH_REQUIRE_GPIOLIB + select MIGHT_HAVE_PCI + select PCI_QUIRKS if PCI if ARCH_MVEBU