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

Conflicts:
	arch/arm/mach-u300/include/mach/irqs.h

diff --cc arch/arm/mach-imx/mach-mx27_3ds.c
Simple merge

diff --cc arch/arm/mach-imx/mach-mx31_3ds.c
Simple merge

diff --cc arch/arm/mach-imx/mach-mx31lite.c
Simple merge

diff --cc arch/arm/mach-imx/mach-mx31moboard.c
Simple merge

diff --cc arch/arm/mach-imx/mach-pcm038.c
Simple merge

diff --cc arch/arm/mach-mx5/mx51_efika.c
Simple merge

diff --cc arch/arm/mach-omap2/board-omap3beagle.c
Simple merge

diff --cc arch/arm/mach-u300/include/mach/irqs.h
index d270fea32926dcf7687013f4cb0fbe0bb4c70694,a6867b12773ed474d851d84d27511403d5f0fecc..5ef40cbe2a115c6af70b38f4624650b03e97925a
--- 1/arch/arm/mach-u300/include/mach/irqs.h
--- 2/arch/arm/mach-u300/include/mach/irqs.h
+++ b/arch/arm/mach-u300/include/mach/irqs.h
@@@ -106,25 -106,9 +106,19 @@@
  #define IRQ_U300_NFIF                 45
  #define IRQ_U300_NFIF2                        46
  #define IRQ_U300_SYSCON_PLL_LOCK      47
 -#define U300_NR_IRQS                  48
 +#define U300_VIC_IRQS_END             48
  #endif
  
 -#define NR_IRQS U300_NR_IRQS
 +/* Maximum 8*7 GPIO lines */
 +#ifdef CONFIG_GPIO_U300
 +#define IRQ_U300_GPIO_BASE            (U300_VIC_IRQS_END)
 +#define IRQ_U300_GPIO_END             (IRQ_U300_GPIO_BASE + 56)
 +#else
 +#define IRQ_U300_GPIO_END             (U300_VIC_IRQS_END)
 +#endif
 +
- /* Optional AB3550 mixsig chip */
- #ifdef CONFIG_AB3550_CORE
- #define IRQ_AB3550_BASE                       (IRQ_U300_GPIO_END)
- #define IRQ_AB3550_END                        (IRQ_AB3550_BASE + 38)
- #else
 +#define IRQ_AB3550_END                        (IRQ_U300_GPIO_END)
- #endif
 +
 +#define NR_IRQS                               (IRQ_AB3550_END)
  
  #endif

diff --cc arch/arm/mach-ux500/board-u5500.c
index e014aa749b039e6ef7da7f9d34e7c7f6ea65c9b8,5c9e66502ebb8e367b5dc1f1cb760d7248e4b15f..82025ba70c0301b11326ac9f6ce3b2da6bcbefa4
--- 1/arch/arm/mach-ux500/board-u5500.c
--- 2/arch/arm/mach-ux500/board-u5500.c
+++ b/arch/arm/mach-ux500/board-u5500.c
@@@ -8,8 -8,10 +8,9 @@@
  #include <linux/init.h>
  #include <linux/platform_device.h>
  #include <linux/amba/bus.h>
 -#include <linux/gpio.h>
  #include <linux/irq.h>
  #include <linux/i2c.h>
+ #include <linux/mfd/ab5500/ab5500.h>
  
  #include <asm/mach/arch.h>
  #include <asm/mach-types.h>

diff --cc drivers/gpio/Kconfig
index 4ab5d6614ffa3e63a90dd47d9a0e6364a90b4291,fbc5fd449a047d51f9cb1df3fa9be5fe01048e66..646503036227b2c98c2f32461c47deddf1d3d4c1
--- 1/drivers/gpio/Kconfig
--- 2/drivers/gpio/Kconfig
+++ b/drivers/gpio/Kconfig
@@@ -170,18 -178,9 +170,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

diff --cc drivers/i2c/busses/Kconfig
Simple merge

diff --cc drivers/input/misc/Kconfig
Simple merge

diff --cc drivers/input/misc/Makefile
Simple merge

diff --cc drivers/mfd/menelaus.c
Simple merge