vserver 1.9.3

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

diff --git a/arch/arm/mach-iop3xx/Kconfig b/arch/arm/mach-iop3xx/Kconfig
index 6a388e2..019b1bf 100644 (file)
--- a/arch/arm/mach-iop3xx/Kconfig
+++ b/arch/arm/mach-iop3xx/Kconfig
@@ -2,53 +2,48 @@ if ARCH_IOP3XX
 
 menu "IOP3xx Implementation Options"
 
-choice
-       prompt "IOP3xx System Type"
-       default ARCH_IQ80310
-
-config ARCH_IQ80310
-       bool "IQ80310"
-       help
-         Say Y here if you want to run your kernel on the Intel IQ80310
-         evaluation kit for the IOP310 chipset.
+comment "IOP3xx Platform Types"
 
 config ARCH_IQ80321
-       bool "IQ80321"
+       bool "Enable support for IQ80321"
+       select ARCH_IOP321
        help
          Say Y here if you want to run your kernel on the Intel IQ80321
          evaluation kit for the IOP321 chipset.
-endchoice
 
-# Which IOP variant are we running?
-config ARCH_IOP310
-       bool
-       default ARCH_IQ80310
+config ARCH_IQ31244
+       bool "Enable support for IQ31244"
+       select ARCH_IOP321
        help
-         The IQ80310 uses the IOP310 variant.
+         Say Y here if you want to run your kernel on the Intel IQ31244
+         evaluation kit for the IOP321 chipset.
+
+config ARCH_IQ80331
+       bool "Enable support for IQ80331"
+       select ARCH_IOP331
+       help
+         Say Y here if you want to run your kernel on the Intel IQ80331
+         evaluation kit for the IOP331 chipset.
+
+config ARCH_EP80219
+    bool "Enable support for EP80219"
+    select ARCH_IOP321
+    select ARCH_IQ31244
 
+# Which IOP variant are we running?
 config ARCH_IOP321
        bool
-       default ARCH_IQ80321
        help
          The IQ80321 uses the IOP321 variant.
+         The IQ31244 and EP80219 uses the IOP321 variant.
 
-comment "IOP3xx Chipset Features"
-
-config IOP3XX_AAU
-       bool "Support Intel IOP3xx Application Accelerator Unit (EXPERIMENTAL)"
-       depends on EXPERIMENTAL
-
-config IOP3XX_DMA
-       bool "Support Intel IOP3xx DMA (EXPERIMENTAL)"
-       depends on EXPERIMENTAL
-
-config IOP3XX_MU
-       bool "Support Intel IOP3xx Messaging Unit (EXPERIMENTAL)"
-       depends on EXPERIMENTAL
+config ARCH_IOP331
+       bool
+       default ARCH_IQ80331
+       help
+         The IQ80331 uses the IOP331 variant.
 
-config IOP3XX_PMON
-       bool "Support Intel IOP3xx Performance Monitor (EXPERIMENTAL)"
-       depends on EXPERIMENTAL
+comment "IOP3xx Chipset Features"
 
 endmenu