This commit was manufactured by cvs2svn to create tag

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

diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index 43adecf..d97eda7 100644 (file)
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -253,7 +253,7 @@ menu "General setup"
 # Select various configuration options depending on the machine type
 config DISCONTIGMEM
        bool
-       depends on ARCH_EDB7211 || ARCH_SA1100 || (ARCH_LH7A40X && !LH7A40X_CONTIGMEM)
+       depends on ARCH_EDB7211 || ARCH_SA1100 || (ARCH_LH7A40X && !LH7A40X_SROMLL)
        default y
        help
          Say Y to support efficient handling of discontiguous physical memory,
@@ -370,7 +370,7 @@ config CPU_FREQ_INTEGRATOR
        help
          This enables the CPUfreq driver for ARM Integrator CPUs.
 
-         For details, take a look at <file:Documentation/cpu-freq>.
+         For details, take a look at linux/Documentation/cpu-freq.
 
          If in doubt, say Y.
 
@@ -821,6 +821,8 @@ config DEBUG_S3C2410_UART
 
 endmenu
 
+source "kernel/vserver/Kconfig"
+
 source "security/Kconfig"
 
 source "crypto/Kconfig"