From: Jason Cooper <jason@lakedaemon.net>
Date: Thu, 13 Jun 2013 18:03:15 +0000 (+0000)
Subject: Merge branch 'mvebu/pcie' into for-next
X-Git-Tag: next-20130617~11^2~4
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=5caaa6f6ed590ef7da6d468bf4749a3eb05fc326;p=karo-tx-linux.git

Merge branch 'mvebu/pcie' into for-next

Conflicts:
	arch/arm/mach-mvebu/Kconfig
---

5caaa6f6ed590ef7da6d468bf4749a3eb05fc326
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