diff --git a/[refs] b/[refs]
index cb62e7c4cf80..34175d278c7d 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d4cc183f7b9f639a048291e9cd95f0c255664b98
+refs/heads/master: 3f4caa8157449b96f8b166c7a98ee40c4bc35a55
diff --git a/trunk/arch/sh/Kconfig b/trunk/arch/sh/Kconfig
index 2d264fa84959..e4be5a485d5c 100644
--- a/trunk/arch/sh/Kconfig
+++ b/trunk/arch/sh/Kconfig
@@ -23,8 +23,7 @@ config SUPERH
 	select HAVE_SPARSE_IRQ
 	select RTC_LIB
 	select GENERIC_ATOMIC64
-	# Support the deprecated APIs until MFD and GPIOLIB catch up.
-	select GENERIC_HARDIRQS_NO_DEPRECATED if !MFD_SUPPORT && !GPIOLIB
+	select GENERIC_HARDIRQS_NO_DEPRECATED
 	select GENERIC_IRQ_SHOW
 	help
 	  The SuperH is a RISC processor targeted for use in embedded systems