Merge branch 'for-linus' of master.kernel.org:/pub/scm/linux/kernel/git/shaggy/jfs-2.6

[~andy/linux] / drivers / net / Kconfig

diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig
index 6bb9232514b4e95a1b6506fe792e61a5f46779e5..96f14ab1c1f52f805e64c62959fadc84d1b1e412 100644 (file)
--- a/drivers/net/Kconfig
+++ b/drivers/net/Kconfig
@@ -1738,11 +1738,18 @@ config 68360_ENET
          the Motorola 68360 processor.
 
 config FEC
-       bool "FEC ethernet controller (of ColdFire 5272)"
-       depends on M5272 || M5282
+       bool "FEC ethernet controller (of ColdFire CPUs)"
+       depends on M523x || M527x || M5272 || M528x
        help
          Say Y here if you want to use the built-in 10/100 Fast ethernet
-         controller on the Motorola ColdFire 5272 processor.
+         controller on some Motorola ColdFire processors.
+
+config FEC2
+       bool "Second FEC ethernet controller (on some ColdFire CPUs)"
+       depends on FEC
+       help
+         Say Y here if you want to use the second built-in 10/100 Fast
+         ethernet controller on some Motorola ColdFire processors.
 
 config NE_H8300
        tristate "NE2000 compatible support for H8/300"
@@ -1944,7 +1951,7 @@ config SKGE
        ---help---
          This driver support the Marvell Yukon or SysKonnect SK-98xx/SK-95xx
          and related Gigabit Ethernet adapters. It is a new smaller driver
-         driver with better performance and more complete ethtool support.
+         with better performance and more complete ethtool support.
 
          It does not support the link failover and network management 
          features that "portable" vendor supplied sk98lin driver does.