V4L/DVB (7754): ivtv: change initialization order to fix an oops when device registra...

[safe/jmp/linux-2.6] / arch / um / Kconfig

diff --git a/arch/um/Kconfig b/arch/um/Kconfig
index 53597bb..dba8e05 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,11 +59,19 @@ 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
        default y
 
+config HZ
+       int
+       default 100
+
 menu "UML-specific options"
 
 config STATIC_LINK
@@ -91,23 +99,6 @@ config LD_SCRIPT_DYN
        default y
        depends on !LD_SCRIPT_STATIC
 
-config NET
-       bool "Networking support"
-       help
-         Unless you really know what you are doing, you should say Y here.
-         The reason is that some programs need kernel networking support even
-         when running on a stand-alone machine that isn't connected to any
-         other computer. If you are upgrading from an older kernel, you
-         should consider updating your networking tools too because changes
-         in the kernel and the tools often go hand in hand. The tools are
-         contained in the package net-tools, the location and version number
-         of which are given in <file:Documentation/Changes>.
-
-         For a general introduction to Linux networking, it is highly
-         recommended to read the NET-HOWTO, available from
-         <http://www.tldp.org/docs.html#howto>.
-
-
 source "fs/Kconfig.binfmt"
 
 config HOSTFS
@@ -141,7 +132,7 @@ config HPPFS
          by removing or changing anything in /proc which gives away the
          identity of a UML.
 
-         See <http://user-mode-linux.sf.net/hppfs.html> for more information.
+         See <http://user-mode-linux.sf.net/old/hppfs.html> for more information.
 
          You only need this if you are setting up a UML honeypot.  Otherwise,
          it is safe to say 'N' here.
@@ -185,8 +176,7 @@ config MAGIC_SYSRQ
 config SMP
        bool "Symmetric multi-processing support (EXPERIMENTAL)"
        default n
-       #SMP_BROKEN is for x86_64.
-       depends on EXPERIMENTAL && (!SMP_BROKEN || (BROKEN && SMP_BROKEN))
+       depends on BROKEN
        help
          This option enables UML SMP support.
          It is NOT related to having a real SMP box. Not directly, at least.
@@ -213,17 +203,6 @@ config NR_CPUS
        depends on SMP
        default "32"
 
-config NEST_LEVEL
-       int "Nesting level"
-       default "0"
-       help
-          This is set to the number of layers of UMLs that this UML will be run
-          in.  Normally, this is zero, meaning that it will run directly on the
-          host.  Setting it to one will build a UML that can run inside a UML
-          that is running on the host.  Generally, if you intend this UML to run
-          inside another UML, set CONFIG_NEST_LEVEL to one more than the host
-          UML.
-
 config HIGHMEM
        bool "Highmem support (EXPERIMENTAL)"
        depends on !64BIT && EXPERIMENTAL
@@ -246,18 +225,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"