Merge remote-tracking branch 'gen-gpio/for_next'

Conflicts:
	arch/sh/kernel/cpu/sh2a/Makefile

diff --cc arch/blackfin/Kconfig
index 453ebe46b065d01d0afa272528220f9e73aede52,20e203aef0fe8b875afd094280bd886e6e07d633..ed629333bab327a444495c170d9de4f669e95d75
--- 1/arch/blackfin/Kconfig
--- 2/arch/blackfin/Kconfig
+++ b/arch/blackfin/Kconfig
@@@ -27,9 -31,8 +27,9 @@@ config BLACKFI
        select HAVE_OPROFILE
        select HAVE_PERF_EVENTS
        select ARCH_HAVE_CUSTOM_GPIO_H
-       select ARCH_WANT_OPTIONAL_GPIOLIB
+       select ARCH_REQUIRE_GPIOLIB
        select HAVE_UID16
 +      select HAVE_UNDERSCORE_SYMBOL_PREFIX
        select VIRT_TO_BUS
        select ARCH_WANT_IPC_PARSE_VERSION
        select HAVE_GENERIC_HARDIRQS

diff --cc arch/mips/Kconfig
Simple merge

diff --cc arch/powerpc/platforms/85xx/Kconfig
Simple merge

diff --cc arch/powerpc/platforms/Kconfig
Simple merge

diff --cc arch/sh/kernel/cpu/sh2a/Makefile
index 130984caa6014c8fa09fd2a6164299d4252e8b5c,990195d9845607bfcca4a8b3cfcd05c41df582bc..92f0da4c86a7533e18269e6f5d439130e1a71815
--- 1/arch/sh/kernel/cpu/sh2a/Makefile
--- 2/arch/sh/kernel/cpu/sh2a/Makefile
+++ b/arch/sh/kernel/cpu/sh2a/Makefile
@@@ -21,5 -21,4 +21,5 @@@ pinmux-$(CONFIG_CPU_SUBTYPE_SH7203)   := 
  pinmux-$(CONFIG_CPU_SUBTYPE_SH7264)   := pinmux-sh7264.o
  pinmux-$(CONFIG_CPU_SUBTYPE_SH7269)   := pinmux-sh7269.o
  
- obj-$(CONFIG_GENERIC_GPIO)            += $(pinmux-y)
+ obj-$(CONFIG_GPIOLIB)                 += $(pinmux-y)
 +obj-$(CONFIG_HAVE_HW_BREAKPOINT)      += ubc.o