vserver 1.9.5.x5

[linux-2.6.git] / arch / sparc / Kconfig

diff --git a/arch/sparc/Kconfig b/arch/sparc/Kconfig
index d39216d..acbeb51 100644 (file)
--- a/arch/sparc/Kconfig
+++ b/arch/sparc/Kconfig
@@ -27,6 +27,7 @@ menu "General machine setup"
 
 config VT
        bool
+       select INPUT
        default y
        ---help---
          If you say Y here, you will get support for terminal devices with
@@ -85,8 +86,8 @@ config SMP
        depends on BROKEN
        ---help---
          This enables support for systems with more than one CPU. If you have
-         a system with only one CPU, like most personal computers, say N. If
-         you have a system with more than one CPU, say Y.
+         a system with only one CPU, say N. If you have a system with more
+         than one CPU, say Y.
 
          If you say N here, the kernel will run on single and multiprocessor
          machines, but will use only one CPU of a multiprocessor machine. If
@@ -94,17 +95,11 @@ config SMP
          singleprocessor machines. On a singleprocessor machine, the kernel
          will run faster if you say N here.
 
-         Note that if you say Y here and choose architecture "586" or
-         "Pentium" under "Processor family", the kernel will not work on 486
-         architectures. Similarly, multiprocessor kernels for the "PPro"
-         architecture may not work on all Pentium based boards.
-
          People using multiprocessor machines who say Y here should also say
          Y to "Enhanced Real Time Clock Support", below. The "Advanced Power
          Management" code will be disabled if you say Y here.
 
          See also the <file:Documentation/smp.txt>,
-         <file:Documentation/i386/IO-APIC.txt>,
          <file:Documentation/nmi_watchdog.txt> and the SMP-HOWTO available at
          <http://www.tldp.org/docs.html#howto>.
 
@@ -188,10 +183,10 @@ config SERIAL_CONSOLE
          (/dev/tty0) will still be used as the system console by default, but
          you can alter that using a kernel command line option such as
          "console=ttyS1". (Try "man bootparam" or see the documentation of
-         your boot loader (lilo or loadlin) about how to pass options to the
-         kernel at boot time.)
+         your boot loader (silo) about how to pass options to the kernel at
+         boot time.)
 
-         If you don't have a VGA card installed and you say Y here, the
+         If you don't have a graphics card installed and you say Y here, the
          kernel will automatically use the first serial line, /dev/ttyS0, as
          system console.
 
@@ -212,6 +207,10 @@ config RWSEM_GENERIC_SPINLOCK
 config RWSEM_XCHGADD_ALGORITHM
        bool
 
+config GENERIC_CALIBRATE_DELAY
+       bool
+       default y
+
 config SUN_PM
        bool
        default y
@@ -222,6 +221,7 @@ config SUN_PM
 config SUN4
        bool "Support for SUN4 machines (disables SUN4[CDM] support)"
        depends on !SMP
+       default n
        help
          Say Y here if, and only if, your machine is a sun4. Note that
          a kernel compiled with this option will run only on sun4.
@@ -248,7 +248,10 @@ config SUN_OPENPROMFS
          -t openpromfs none /proc/openprom".
 
          To compile the /proc/openprom support as a module, choose M here: the
-         module will be called openpromfs.  If unsure, choose M.
+         module will be called openpromfs.
+
+         Only choose N if you know in advance that you will not need to modify
+         OpenPROM settings on the running system.
 
 source "fs/Kconfig.binfmt"
 
@@ -281,9 +284,9 @@ config PRINTER
 
          If you have several parallel ports, you can specify which ports to
          use with the "lp" kernel command line option.  (Try "man bootparam"
-         or see the documentation of your boot loader (lilo or loadlin) about
-         how to pass options to the kernel at boot time.)  The syntax of the
-         "lp" command line option can be found in <file:drivers/char/lp.c>.
+         or see the documentation of your boot loader (silo) about how to pass
+         options to the kernel at boot time.)  The syntax of the "lp" command
+         line option can be found in <file:drivers/char/lp.c>.
 
          If you have more than 8 printers, you need to increase the LP_NO
          macro in lp.c and the PARPORT_MAX macro in parport.h.
@@ -377,6 +380,8 @@ source "sound/Kconfig"
 
 source "drivers/usb/Kconfig"
 
+source "drivers/infiniband/Kconfig"
+
 source "drivers/char/watchdog/Kconfig"
 
 source "arch/sparc/Kconfig.debug"