diff --git a/[refs] b/[refs]
index 4939cfeb3f01..6bbcd9abe848 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 8df274064e02aa8929eb5087dd8841b6601ab0ae
+refs/heads/master: dfff95c394b0dd977a6b65bd52b99703fae94d9b
diff --git a/trunk/arch/um/Kconfig.common b/trunk/arch/um/Kconfig.common
index 049d048b070d..e351e14b4339 100644
--- a/trunk/arch/um/Kconfig.common
+++ b/trunk/arch/um/Kconfig.common
@@ -3,14 +3,10 @@ config DEFCONFIG_LIST
 	option defconfig_list
 	default "arch/$ARCH/defconfig"
 
-# UML uses the generic IRQ subsystem
-config GENERIC_HARDIRQS
-	bool
-	default y
-
 config UML
 	bool
 	default y
+	select HAVE_GENERIC_HARDIRQS
 
 config MMU
 	bool