diff --git a/[refs] b/[refs]
index 50edb0a81f1a..74cf54e787a3 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 7b0288634921c748dfeb2ff3e7d04ae7cc94e795
+refs/heads/master: f39b02d6f9af8c942961ef32c2bbce6cb6100c29
diff --git a/trunk/arch/frv/Kconfig b/trunk/arch/frv/Kconfig
index e504edeb3d84..747499a1b31e 100644
--- a/trunk/arch/frv/Kconfig
+++ b/trunk/arch/frv/Kconfig
@@ -5,6 +5,7 @@ config FRV
 	select HAVE_ARCH_TRACEHOOK
 	select HAVE_IRQ_WORK
 	select HAVE_PERF_EVENTS
+	select HAVE_GENERIC_HARDIRQS
 
 config ZONE_DMA
 	bool
@@ -29,10 +30,6 @@ config GENERIC_CALIBRATE_DELAY
 	bool
 	default n
 
-config GENERIC_HARDIRQS
-	bool
-	default y
-
 config TIME_LOW_RES
 	bool
 	default y