From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Thu, 22 Sep 2011 06:20:51 +0000 (+1000)
Subject: Merge remote-tracking branch 'mfd/for-next'
X-Git-Tag: next-20110922~41
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=76a55c51810512a77ca7f3673d1d38763c182200;p=karo-tx-linux.git

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

76a55c51810512a77ca7f3673d1d38763c182200
diff --cc drivers/gpio/Kconfig
index f412e3fdeb35,fbc5fd449a04..20f257fb2bc3
--- a/drivers/gpio/Kconfig
+++ b/drivers/gpio/Kconfig
@@@ -162,18 -178,9 +162,18 @@@ config GPIO_SC
  	  The Intel Tunnel Creek processor has 5 GPIOs powered by the
  	  core power rail and 9 from suspend power supply.
  
 +config GPIO_U300
 +	bool "ST-Ericsson U300 COH 901 335/571 GPIO"
 +	depends on GPIOLIB && ARCH_U300
 +	help
 +	  Say yes here to support GPIO interface on ST-Ericsson U300.
 +	  The names of the two IP block variants supported are
 +	  COH 901 335 and COH 901 571/3. They contain 3, 5 or 7
 +	  ports of 8 GPIO pins each.
 +
  config GPIO_VX855
  	tristate "VIA VX855/VX875 GPIO"
- 	depends on MFD_SUPPORT && PCI
+ 	depends on PCI
  	select MFD_CORE
  	select MFD_VX855
  	help