Merge branch 'gpio/next-mx' into gpio/next

diff --cc drivers/gpio/Kconfig
index 21271a5209abc0aa77a9c4fe94adc15de942834d,57d7bc547f4b4c571b38ad4c8e9141adcb9be6ca..f8b6e7d27e4c156476cb66c2c63f00f576dd7f48
--- 1/drivers/gpio/Kconfig
--- 2/drivers/gpio/Kconfig
+++ b/drivers/gpio/Kconfig
@@@ -86,25 -86,42 +86,34 @@@ config GPIO_IT8761
        help
          Say yes here to support GPIO functionality of IT8761E super I/O chip.
  
 +config GPIO_EP93XX
 +      def_bool y
 +      depends on ARCH_EP93XX
 +
  config GPIO_EXYNOS4
 -      bool "Samsung Exynos4 GPIO library support"
 -      default y if CPU_EXYNOS4210
 -      depends on ARM
 -      help
 -        Say yes here to support Samsung Exynos4 series SoCs GPIO library
 +      def_bool y
 +      depends on CPU_EXYNOS4210
  
+ config GPIO_MXS
+       def_bool y
+       depends on ARCH_MXS
+ 
+ config GPIO_MXC
+       def_bool y
+       depends on ARCH_MXC
+       select GPIO_BASIC_MMIO_CORE
+ 
  config GPIO_PLAT_SAMSUNG
 -      bool "Samsung SoCs GPIO library support"
 -      default y if SAMSUNG_GPIOLIB_4BIT
 -      depends on ARM
 -      help
 -        Say yes here to support Samsung SoCs GPIO library
 +      def_bool y
 +      depends on SAMSUNG_GPIOLIB_4BIT
  
  config GPIO_S5PC100
 -      bool "Samsung S5PC100 GPIO library support"
 -      default y if CPU_S5PC100
 -      depends on ARM
 -      help
 -        Say yes here to support Samsung S5PC100 SoCs GPIO library
 +      def_bool y
 +      depends on CPU_S5PC100
  
  config GPIO_S5PV210
 -      bool "Samsung S5PV210/S5PC110 GPIO library support"
 -      default y if CPU_S5PV210
 -      depends on ARM
 -      help
 -        Say yes here to support Samsung S5PV210/S5PC110 SoCs GPIO library
 +      def_bool y
 +      depends on CPU_S5PV210
  
  config GPIO_PL061
        bool "PrimeCell PL061 GPIO support"

diff --cc drivers/gpio/Makefile
index e6e503229c869946c7cb8e93aa1c45435d85fd2e,9c37339a57a792e442aa4c03732e10933ec085de..66923cf3ad6a8bd4d0a70d71b3d6d6da1694462a
--- 1/drivers/gpio/Makefile
--- 2/drivers/gpio/Makefile
+++ b/drivers/gpio/Makefile
@@@ -8,8 -8,9 +8,10 @@@ obj-$(CONFIG_GPIO_ADP5520)      += adp5520-g
  obj-$(CONFIG_GPIO_ADP5588)    += adp5588-gpio.o
  obj-$(CONFIG_GPIO_BASIC_MMIO_CORE)    += basic_mmio_gpio.o
  obj-$(CONFIG_GPIO_BASIC_MMIO) += basic_mmio_gpio.o
 +obj-$(CONFIG_GPIO_EP93XX)     += gpio-ep93xx.o
  obj-$(CONFIG_GPIO_EXYNOS4)    += gpio-exynos4.o
+ obj-$(CONFIG_GPIO_MXC)                += gpio-mxc.o
+ obj-$(CONFIG_GPIO_MXS)                += gpio-mxs.o
  obj-$(CONFIG_GPIO_PLAT_SAMSUNG)       += gpio-plat-samsung.o
  obj-$(CONFIG_GPIO_S5PC100)    += gpio-s5pc100.o
  obj-$(CONFIG_GPIO_S5PV210)    += gpio-s5pv210.o