From: Linus Walleij <linus.walleij@linaro.org>
Date: Thu, 8 Nov 2012 13:58:01 +0000 (+0100)
Subject: Merge branch 'devel' into for-next
X-Git-Tag: next-20121109~29^2~3
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=8819a745cd6a40f0e537e72ffebb9deaade6b759;p=karo-tx-linux.git

Merge branch 'devel' into for-next
---

8819a745cd6a40f0e537e72ffebb9deaade6b759
diff --cc drivers/pinctrl/Kconfig
index d96caefd914a,b088ac221467..5f2f9dc43e3b
--- a/drivers/pinctrl/Kconfig
+++ b/drivers/pinctrl/Kconfig
@@@ -185,30 -184,9 +185,10 @@@ config PINCTRL_SAMSUN
  
  config PINCTRL_EXYNOS4
  	bool "Pinctrl driver data for Exynos4 SoC"
 +	depends on OF && GPIOLIB
  	select PINCTRL_SAMSUNG
  
- config PINCTRL_MVEBU
- 	bool
- 	depends on ARCH_MVEBU
- 	select PINMUX
- 	select PINCONF
- 
- config PINCTRL_DOVE
- 	bool
- 	select PINCTRL_MVEBU
- 
- config PINCTRL_KIRKWOOD
- 	bool
- 	select PINCTRL_MVEBU
- 
- config PINCTRL_ARMADA_370
- 	bool
- 	select PINCTRL_MVEBU
- 
- config PINCTRL_ARMADA_XP
- 	bool
- 	select PINCTRL_MVEBU
+ source "drivers/pinctrl/mvebu/Kconfig"
  
  source "drivers/pinctrl/spear/Kconfig"