diff --git a/[refs] b/[refs]
index c070bdbfbc07..e670b1e38604 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 5d07b7869a48aec43ee0de6413a6657457287b63
+refs/heads/master: 2c7d1644406748d7c5da7b9db3c5080296af55bf
diff --git a/trunk/arch/sparc/Kconfig b/trunk/arch/sparc/Kconfig
index 730dda1ad143..cb1c2f112fa9 100644
--- a/trunk/arch/sparc/Kconfig
+++ b/trunk/arch/sparc/Kconfig
@@ -26,7 +26,6 @@ config SPARC
 	select HAVE_DMA_API_DEBUG
 	select HAVE_ARCH_JUMP_LABEL
 	select HAVE_GENERIC_HARDIRQS
-	select GENERIC_HARDIRQS_NO_DEPRECATED
 	select GENERIC_IRQ_SHOW
 	select USE_GENERIC_SMP_HELPERS if SMP