VServer 1.9.2 (patch-2.6.8.1-vs1.9.2.diff)

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

diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index 2de01ba..e4435a4 100644 (file)
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -72,9 +72,6 @@ choice
        prompt "ARM system type"
        default ARCH_RPC
 
-config ARCH_ADIFCC
-       bool "ADIFCC-based"
-
 config ARCH_CLPS7500
        bool "Cirrus-CL-PS7500FE"
 
@@ -191,6 +188,11 @@ config ARCH_ACORN
        depends on ARCH_RPC
        default y
 
+config TIMER_ACORN
+       bool
+       depends on ARCH_ACORN || ARCH_CLPS7500
+       default y
+
 #####################################################################
 # Footbridge support
 config FOOTBRIDGE
@@ -220,6 +222,11 @@ config SA1111
        depends on ASSABET_NEPONSET || SA1100_ADSBITSY || SA1100_BADGE4 || SA1100_CONSUS || SA1100_GRAPHICSMASTER || SA1100_JORNADA720 || ARCH_LUBBOCK || SA1100_PFS168 || SA1100_PT_SYSTEM3 || SA1100_XP860
        default y
 
+config SHARP_LOCOMO
+       bool
+       depends on SA1100_COLLIE
+       default y
+
 config FORCE_MAX_ZONEORDER
        int
        depends on SA1111
@@ -246,10 +253,10 @@ menu "General setup"
 # Select various configuration options depending on the machine type
 config DISCONTIGMEM
        bool
-       depends on ARCH_EDB7211 || ARCH_SA1100 || ARCH_LH7A40X
+       depends on ARCH_EDB7211 || ARCH_SA1100 || (ARCH_LH7A40X && !LH7A40X_CONTIGMEM)
        default y
        help
-         Say Y to upport efficient handling of discontiguous physical memory,
+         Say Y to support efficient handling of discontiguous physical memory,
          for architectures which are either NUMA (Non-Uniform Memory Access)
          or have huge holes in the physical address space for other reasons.
          See <file:Documentation/vm/numa> for more.
@@ -257,7 +264,7 @@ config DISCONTIGMEM
 # Now handle the bus types
 config PCI
        bool "PCI support" if ARCH_INTEGRATOR_AP
-       default y if ARCH_FTVPCI || ARCH_SHARK || FOOTBRIDGE_HOST || ARCH_IOP3XX || ARCH_IXP4XX
+       default y if ARCH_SHARK || FOOTBRIDGE_HOST || ARCH_IOP3XX || ARCH_IXP4XX
        help
          Find out whether you have a PCI motherboard. PCI is the name of a
          bus system, i.e. the way the CPU talks to the other stuff inside
@@ -270,11 +277,6 @@ config PCI
          doesn't.
 
 # Select the host bridge type
-config PCI_HOST_PLX90X0
-       bool
-       depends on PCI && ARCH_FTVPCI
-       default y
-
 config PCI_HOST_VIA82C505
        bool
        depends on PCI && ARCH_SHARK
@@ -368,7 +370,7 @@ config CPU_FREQ_INTEGRATOR
        help
          This enables the CPUfreq driver for ARM Integrator CPUs.
 
-         For details, take a look at linux/Documentation/cpu-freq.
+         For details, take a look at <file:Documentation/cpu-freq>.
 
          If in doubt, say Y.
 
@@ -421,6 +423,17 @@ config FPE_FASTFPE
          If you do not feel you need a faster FP emulation you should better
          choose NWFPE.
 
+config VFP
+       bool "VFP-format floating point maths"
+       help
+         Say Y to include VFP support code in the kernel. This is needed
+         if your hardware includes a VFP unit.
+
+         Please see <file:Documentation/arm/VFP/release-notes.txt> for
+         release notes and additional status information.
+
+         Say N if your target does not have VFP hardware.
+
 source "fs/Kconfig.binfmt"
 
 source "drivers/base/Kconfig"
@@ -539,7 +552,7 @@ config CMDLINE
 
 config LEDS
        bool "Timer and CPU usage LEDs"
-       depends on ARCH_NETWINDER || ARCH_EBSA110 || ARCH_EBSA285 || ARCH_FTVPCI || ARCH_SHARK || ARCH_CO285 || ARCH_SA1100 || ARCH_LUBBOCK || MACH_MAINSTONE || ARCH_PXA_IDP || ARCH_INTEGRATOR || ARCH_CDB89712 || ARCH_P720T || ARCH_OMAP || ARCH_VERSATILE_PB
+       depends on ARCH_NETWINDER || ARCH_EBSA110 || ARCH_EBSA285 || ARCH_SHARK || ARCH_CO285 || ARCH_SA1100 || ARCH_LUBBOCK || MACH_MAINSTONE || ARCH_PXA_IDP || ARCH_INTEGRATOR || ARCH_CDB89712 || ARCH_P720T || ARCH_OMAP || ARCH_VERSATILE_PB
        help
          If you say Y here, the LEDs on your machine will be used
          to provide useful information about your current system status.
@@ -553,7 +566,7 @@ config LEDS
 
 config LEDS_TIMER
        bool "Timer LED" if LEDS && (ARCH_NETWINDER || ARCH_EBSA285 || ARCH_SHARK || MACH_MAINSTONE || ARCH_CO285 || ARCH_SA1100 || ARCH_LUBBOCK || ARCH_PXA_IDP || ARCH_INTEGRATOR || ARCH_P720T || ARCH_VERSATILE_PB)
-       depends on ARCH_NETWINDER || ARCH_EBSA110 || ARCH_EBSA285 || ARCH_FTVPCI || ARCH_SHARK || ARCH_CO285 || ARCH_SA1100 || ARCH_LUBBOCK || MACH_MAINSTONE || ARCH_PXA_IDP || ARCH_INTEGRATOR || ARCH_CDB89712 || ARCH_P720T || ARCH_OMAP || ARCH_VERSATILE_PB
+       depends on ARCH_NETWINDER || ARCH_EBSA110 || ARCH_EBSA285 || ARCH_SHARK || ARCH_CO285 || ARCH_SA1100 || ARCH_LUBBOCK || MACH_MAINSTONE || ARCH_PXA_IDP || ARCH_INTEGRATOR || ARCH_CDB89712 || ARCH_P720T || ARCH_OMAP || ARCH_VERSATILE_PB
        default y if ARCH_EBSA110
        help
          If you say Y here, one of the system LEDs (the green one on the
@@ -609,7 +622,7 @@ source "drivers/acorn/block/Kconfig"
 
 source "net/Kconfig"
 
-if ARCH_CLPS7500 || ARCH_IOP3XX || ARCH_IXP4XX || ARCH_L7200 || ARCH_LH7A40X || ARCH_FTVPCI || ARCH_PXA || ARCH_RPC || ARCH_S3C2410 || ARCH_SA1100 || ARCH_SHARK || FOOTBRIDGE
+if ARCH_CLPS7500 || ARCH_IOP3XX || ARCH_IXP4XX || ARCH_L7200 || ARCH_LH7A40X || ARCH_PXA || ARCH_RPC || ARCH_S3C2410 || ARCH_SA1100 || ARCH_SHARK || FOOTBRIDGE
 source "drivers/ide/Kconfig"
 endif