vserver 1.9.5.x5

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

diff --git a/arch/sparc64/Kconfig b/arch/sparc64/Kconfig
index 0bcd075..5b0c737 100644 (file)
--- a/arch/sparc64/Kconfig
+++ b/arch/sparc64/Kconfig
@@ -18,6 +18,11 @@ config TIME_INTERPOLATION
 
 source "init/Kconfig"
 
+config SYSVIPC_COMPAT
+       bool
+       depends on COMPAT && SYSVIPC
+       default y
+
 menu "General machine setup"
 
 config BBC_I2C
@@ -92,8 +97,8 @@ config SMP
        bool "Symmetric multi-processing support"
        ---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
@@ -101,17 +106,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>.
 
@@ -135,16 +134,7 @@ config NR_CPUS
        depends on SMP
        default "32"
 
-config CPU_FREQ
-       bool "CPU Frequency scaling"
-       help
-         Clock scaling allows you to change the clock speed of CPUs on the
-         fly.  Currently there are only sparc64 drivers for UltraSPARC-III
-         and UltraSPARC-IIe processors.
-
-         For details, take a look at <file:Documentation/cpu-freq>.
-
-         If in doubt, say N.
+source "drivers/cpufreq/Kconfig"
 
 config CPU_FREQ_TABLE
        tristate "CPU frequency table helpers"
@@ -176,8 +166,6 @@ config US2E_FREQ
 
          If in doubt, say N.
 
-source "drivers/cpufreq/Kconfig"
-
 # Identify this as a Sparc64 build
 config SPARC64
        bool
@@ -197,6 +185,10 @@ config RWSEM_XCHGADD_ALGORITHM
        bool
        default y
 
+config GENERIC_CALIBRATE_DELAY
+       bool
+       default y
+
 choice
        prompt "SPARC64 Huge TLB Page Size"
        depends on HUGETLB_PAGE
@@ -567,7 +559,7 @@ config DRM
 
 config DRM_FFB
        tristate "Creator/Creator3D"
-       depends on DRM
+       depends on DRM && BROKEN
        help
          Choose this option if you have one of Sun's Creator3D-based graphics
          and frame buffer cards.  Product page at
@@ -602,6 +594,8 @@ source "sound/Kconfig"
 
 source "drivers/usb/Kconfig"
 
+source "drivers/infiniband/Kconfig"
+
 source "drivers/char/watchdog/Kconfig"
 
 source "arch/sparc64/oprofile/Kconfig"