linux 2.6.16.38 w/ vs2.0.3-rc1

[linux-2.6.git] / arch / ppc / platforms / 4xx / Kconfig

diff --git a/arch/ppc/platforms/4xx/Kconfig b/arch/ppc/platforms/4xx/Kconfig
index 293bd48..d883791 100644 (file)
--- a/arch/ppc/platforms/4xx/Kconfig
+++ b/arch/ppc/platforms/4xx/Kconfig
@@ -57,10 +57,6 @@ config XILINX_ML300
        help
          This option enables support for the Xilinx ML300 evaluation board.
 
-config XILINX_ML403
-       bool "Xilinx-ML403"
-       help
-         This option enables support for the Xilinx ML403 evaluation board.
 endchoice
 
 choice
@@ -176,6 +172,11 @@ config IBM_OCP
        depends on ASH || BAMBOO || BUBINGA || CPCI405 || EBONY || EP405 || LUAN || YUCCA || OCOTEA || REDWOOD_5 || REDWOOD_6 || SYCAMORE || WALNUT
        default y
 
+config XILINX_OCP
+       bool
+       depends on XILINX_ML300
+       default y
+
 config IBM_EMAC4
        bool
        depends on 440GX || 440SP || 440SPE
@@ -183,7 +184,7 @@ config IBM_EMAC4
 
 config BIOS_FIXUP
        bool
-       depends on BUBINGA || EP405 || SYCAMORE || WALNUT || CPCI405
+       depends on BUBINGA || EP405 || SYCAMORE || WALNUT
        default y
 
 # OAK doesn't exist but wanted to keep this around for any future 403GCX boards
@@ -207,21 +208,11 @@ config 405GPR
        depends on SYCAMORE
        default y
 
-config XILINX_VIRTEX_II_PRO
+config VIRTEX_II_PRO
        bool
        depends on XILINX_ML300
        default y
 
-config XILINX_VIRTEX_4_FX
-       bool
-       depends on XILINX_ML403
-       default y
-
-config XILINX_VIRTEX
-       bool
-       depends on XILINX_VIRTEX_II_PRO || XILINX_VIRTEX_4_FX
-       default y
-
 config STB03xxx
        bool
        depends on REDWOOD_5 || REDWOOD_6
@@ -229,7 +220,7 @@ config STB03xxx
 
 config EMBEDDEDBOOT
        bool
-       depends on EP405 || XILINX_ML300 || XILINX_ML403
+       depends on EP405 || XILINX_ML300
        default y
 
 config IBM_OPENBIOS