From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Mon, 10 Sep 2012 05:45:04 +0000 (+1000)
Subject: Merge remote-tracking branch 'samsung/for-next'
X-Git-Tag: next-20120910~10
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=507ec722b22e636dc26c6f3c19d211cbbfe64c36;p=karo-tx-linux.git

Merge remote-tracking branch 'samsung/for-next'

Conflicts:
	drivers/pinctrl/Makefile
---

507ec722b22e636dc26c6f3c19d211cbbfe64c36
diff --cc drivers/pinctrl/Kconfig
index 1ffaa326f668,34e94c7f68ca..274980dcfa4f
--- a/drivers/pinctrl/Kconfig
+++ b/drivers/pinctrl/Kconfig
@@@ -172,13 -145,17 +172,22 @@@ config PINCTRL_COH90
  	  COH 901 335 and COH 901 571/3. They contain 3, 5 or 7
  	  ports of 8 GPIO pins each.
  
+ config PINCTRL_SAMSUNG
+ 	bool "Samsung pinctrl driver"
+ 	select PINMUX
+ 	select PINCONF
+ 
+ config PINCTRL_EXYNOS4
+ 	bool "Pinctrl driver data for Exynos4 SoC"
+ 	select PINCTRL_SAMSUNG
+ 
  source "drivers/pinctrl/spear/Kconfig"
  
 +config PINCTRL_XWAY
 +	bool
 +	depends on SOC_TYPE_XWAY
 +	depends on PINCTRL_LANTIQ
 +
  endmenu
  
  endif
diff --cc drivers/pinctrl/Makefile
index 26a86c7baf6c,6a88113e11d9..60baaff2d358
--- a/drivers/pinctrl/Makefile
+++ b/drivers/pinctrl/Makefile
@@@ -33,7 -29,7 +33,9 @@@ obj-$(CONFIG_PINCTRL_TEGRA20)	+= pinctr
  obj-$(CONFIG_PINCTRL_TEGRA30)	+= pinctrl-tegra30.o
  obj-$(CONFIG_PINCTRL_U300)	+= pinctrl-u300.o
  obj-$(CONFIG_PINCTRL_COH901)	+= pinctrl-coh901.o
 +obj-$(CONFIG_PINCTRL_XWAY)	+= pinctrl-xway.o
 +obj-$(CONFIG_PINCTRL_LANTIQ)	+= pinctrl-lantiq.o
+ obj-$(CONFIG_PINCTRL_SAMSUNG)	+= pinctrl-samsung.o
+ obj-$(CONFIG_PINCTRL_EXYNOS4)	+= pinctrl-exynos.o
  
  obj-$(CONFIG_PLAT_SPEAR)	+= spear/