diff --git a/[refs] b/[refs]
index 1a5951d8ce8b..3eb9874bfb27 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 4ec008d630d9d96579b5911c140bb8de2aa68f0e
+refs/heads/master: 875c9d09b5a6400d6882b0e6e828862a73ce739d
diff --git a/trunk/arch/um/Kconfig.common b/trunk/arch/um/Kconfig.common
index 20a49ba93cb9..806185de0ba2 100644
--- a/trunk/arch/um/Kconfig.common
+++ b/trunk/arch/um/Kconfig.common
@@ -10,6 +10,7 @@ config UML
 	select GENERIC_IRQ_SHOW
 	select GENERIC_CPU_DEVICES
 	select GENERIC_IO
+	select GENERIC_CLOCKEVENTS
 
 config MMU
 	bool
@@ -52,10 +53,6 @@ config GENERIC_BUG
 	default y
 	depends on BUG
 
-config GENERIC_CLOCKEVENTS
-	bool
-	default y
-
 # Used in kernel/irq/manage.c and include/linux/irq.h
 config IRQ_RELEASE_METHOD
 	bool