Merge branch 'mvebu/pcie' into for-next

Conflicts:
	arch/arm/mach-mvebu/Kconfig

diff --cc arch/arm/mach-mvebu/Kconfig
index 80a8bcacd9d539c0a684e3beaa927b07dd720566,381062d90c1d2569f67599077f04d68556c6c3b0..fb827ac9d906291aa58d92584d0845a9708d3609
--- 1/arch/arm/mach-mvebu/Kconfig
--- 2/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