Add changes from the Linux-2.6 tree.

[linux-2.6.git] / arch / ppc / 8260_io / Kconfig

diff --git a/arch/ppc/8260_io/Kconfig b/arch/ppc/8260_io/Kconfig
index a613c5c..ea9651e 100644 (file)
--- a/arch/ppc/8260_io/Kconfig
+++ b/arch/ppc/8260_io/Kconfig
@@ -1,12 +1,9 @@
 #
-# MPC8260 Communication options
+# CPM2 Communication options
 #
 
-menu "MPC8260 CPM Options"
-       depends on 8260
-
-config SCC_CONSOLE
-       bool "Enable SCC Console"
+menu "CPM2 Options"
+       depends on CPM2
 
 config SCC_ENET
        bool "CPM SCC Ethernet"
@@ -24,19 +21,19 @@ config FCC1_ENET
        bool "Ethernet on FCC1"
        depends on FEC_ENET
        help
-         Use MPC8260 fast Ethernet controller 1 to drive Ethernet (default).
+         Use CPM2 fast Ethernet controller 1 to drive Ethernet (default).
 
 config FCC2_ENET
        bool "Ethernet on FCC2"
        depends on FEC_ENET
        help
-         Use MPC8260 fast Ethernet controller 2 to drive Ethernet.
+         Use CPM2 fast Ethernet controller 2 to drive Ethernet.
 
 config FCC3_ENET
        bool "Ethernet on FCC3"
        depends on FEC_ENET
        help
-         Use MPC8260 fast Ethernet controller 3 to drive Ethernet.
+         Use CPM2 fast Ethernet controller 3 to drive Ethernet.
 
 config USE_MDIO
        bool "Use MDIO for PHY configuration"
@@ -45,7 +42,7 @@ config USE_MDIO
 choice
        prompt "Type of PHY"
        depends on 8260 && USE_MDIO
-       default FCC_LXT971
+       default FCC_GENERIC_PHY
 
 config FCC_LXT970
        bool "LXT970"
@@ -56,6 +53,13 @@ config FCC_LXT971
 config FCC_QS6612
        bool "QS6612"
 
+config FCC_DM9131
+       bool "DM9131"
+
+config FCC_DM9161
+       bool "DM9161"
+
+config FCC_GENERIC_PHY
+       bool "Generic"
 endchoice
 endmenu
-