Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input

[pandora-kernel.git] / arch / um / Kconfig

diff --git a/arch/um/Kconfig b/arch/um/Kconfig
index 53597bb..dd1689b 100644 (file)
--- a/arch/um/Kconfig
+++ b/arch/um/Kconfig
@@ -3,7 +3,7 @@ config DEFCONFIG_LIST
        option defconfig_list
        default "arch/$ARCH/defconfig"
 
-# UML uses the generic IRQ sugsystem
+# UML uses the generic IRQ subsystem
 config GENERIC_HARDIRQS
        bool
        default y
@@ -59,6 +59,10 @@ config GENERIC_TIME
        bool
        default y
 
+config GENERIC_CLOCKEVENTS
+       bool
+       default y
+
 # Used in kernel/irq/manage.c and include/linux/irq.h
 config IRQ_RELEASE_METHOD
        bool
@@ -246,18 +250,6 @@ config KERNEL_STACK_ORDER
          be 1 << order pages.  The default is OK unless you're running Valgrind
          on UML, in which case, set this to 3.
 
-config UML_REAL_TIME_CLOCK
-       bool "Real-time Clock"
-       default y
-       help
-         This option makes UML time deltas match wall clock deltas.  This
-         should normally be enabled.  The exception would be if you are
-         debugging with UML and spend long times with UML stopped at a
-         breakpoint.  In this case, when UML is restarted, it will call the
-         timer enough times to make up for the time spent at the breakpoint.
-         This could result in a noticeable lag.  If this is a problem, then
-         disable this option.
-
 endmenu
 
 source "init/Kconfig"
@@ -297,4 +289,6 @@ config INPUT
        bool
        default n
 
+source "kernel/Kconfig.instrumentation"
+
 source "arch/um/Kconfig.debug"