Fedora kernel-2.6.17-1.2142_FC4 patched with stable patch-2.6.17.4-vs2.0.2-rc26.diff

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

diff --git a/arch/arm/mach-clps711x/Kconfig b/arch/arm/mach-clps711x/Kconfig
index 4e2278f..0e2b641 100644 (file)
--- a/arch/arm/mach-clps711x/Kconfig
+++ b/arch/arm/mach-clps711x/Kconfig
@@ -1,16 +1,16 @@
+if ARCH_CLPS711X
 
 menu "CLPS711X/EP721X Implementations"
 
 config ARCH_AUTCPU12
        bool "AUTCPU12"
-       depends on ARCH_CLPS711X
        help
          Say Y if you intend to run the kernel on the autronix autcpu12
          board. This board is based on a Cirrus Logic CS89712.
 
 config ARCH_CDB89712
        bool "CDB89712"
-       depends on ARCH_CLPS711X
+       select ISA
        help
          This is an evaluation board from Cirrus for the CS89712 processor.
          The board includes 2 serial ports, Ethernet, IRDA, and expansion
@@ -18,32 +18,31 @@ config ARCH_CDB89712
 
 config ARCH_CEIVA
        bool "CEIVA"
-       depends on ARCH_CLPS711X
        help
          Say Y here if you intend to run this kernel on the Ceiva/Polaroid
          PhotoMax Digital Picture Frame.
 
 config ARCH_CLEP7312
        bool "CLEP7312"
-       depends on ARCH_CLPS711X
+       help
+         Boards based on the Cirrus Logic 7212/7312 chips.
 
 config ARCH_EDB7211
        bool "EDB7211"
-       depends on ARCH_CLPS711X
+       select ISA
+       select ARCH_DISCONTIGMEM_ENABLE
        help
          Say Y here if you intend to run this kernel on a Cirrus Logic EDB-7211
          evaluation board.
 
 config ARCH_P720T
        bool "P720T"
-       depends on ARCH_CLPS711X
        help
          Say Y here if you intend to run this kernel on the ARM Prospector
          720T.
 
 config ARCH_FORTUNET
        bool "FORTUNET"
-       depends on ARCH_CLPS711X
 
 # XXX Maybe these should indicate register compatibility
 # instead of being mutually exclusive.
@@ -74,3 +73,4 @@ config EP72XX_ROM_BOOT
 
 endmenu
 
+endif