This commit was manufactured by cvs2svn to create tag

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

diff --git a/arch/ppc/platforms/85xx/Kconfig b/arch/ppc/platforms/85xx/Kconfig
index e4666df..36cc062 100644 (file)
--- a/arch/ppc/platforms/85xx/Kconfig
+++ b/arch/ppc/platforms/85xx/Kconfig
@@ -17,20 +17,10 @@ choice
        default MPC8540_ADS
 
 config MPC8540_ADS
-       bool "Freescale MPC8540 ADS"
+       bool "MPC8540ADS"
        help
          This option enables support for the MPC 8540 ADS evaluation board.
 
-config MPC8555_CDS
-       bool "Freescale MPC8555 CDS"
-       help
-         This option enablese support for the MPC8555 CDS evaluation board.
-
-config MPC8560_ADS
-       bool "Freescale MPC8560 ADS"
-       help
-         This option enables support for the MPC 8560 ADS evaluation board.
-
 config SBC8560
        bool "WindRiver PowerQUICC III SBC8560"
        help
@@ -47,19 +37,9 @@ config MPC8540
        depends on MPC8540_ADS
        default y
 
-config MPC8555
-       bool
-       depends on MPC8555_CDS
-       default y
-
 config MPC8560
        bool
-       depends on SBC8560 || MPC8560_ADS
-       default y
-
-config 85xx_PCI2
-       bool "Supprt for 2nd PCI host controller"
-       depends on MPC8555_CDS
+       depends on SBC8560
        default y
 
 config FSL_OCP
@@ -69,7 +49,7 @@ config FSL_OCP
 
 config PPC_GEN550
        bool
-       depends on MPC8540 || SBC8560 || MPC8555
+       depends on MPC8540 || SBC8560
        default y
 
 endmenu