git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
VServer 1.9.2 (patch-2.6.8.1-vs1.9.2.diff)
[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
..
391e854
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"
config SCC_ENET
bool "CPM SCC Ethernet"
@@
-24,19
+21,19
@@
config FCC1_ENET
bool "Ethernet on FCC1"
depends on FEC_ENET
help
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
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
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"
config USE_MDIO
bool "Use MDIO for PHY configuration"