diff options
| author | Jeff Garzik <jeff@garzik.org> | 2007-10-23 20:15:54 -0400 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2007-10-23 20:15:54 -0400 |
| commit | 02bae2129710018883f9536969de7e6acf9304ca (patch) | |
| tree | c2f3b120b4c48288e2735fa7136895da3ff8615a /drivers/net/Kconfig | |
| parent | c7ffb6bb7a1b6fe5912a009d561733911769d32b (diff) | |
| parent | c1f395f1c76b115c9691e1546942651fedb08c37 (diff) | |
| download | op-kernel-dev-02bae2129710018883f9536969de7e6acf9304ca.zip op-kernel-dev-02bae2129710018883f9536969de7e6acf9304ca.tar.gz | |
Merge branch 'features' of git://farnsworth.org/dale/linux-2.6-mv643xx_eth into upstream
Diffstat (limited to 'drivers/net/Kconfig')
| -rw-r--r-- | drivers/net/Kconfig | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig index 2538816..86b8641 100644 --- a/drivers/net/Kconfig +++ b/drivers/net/Kconfig @@ -2371,13 +2371,16 @@ config UGETH_TX_ON_DEMAND depends on UCC_GETH config MV643XX_ETH - tristate "MV-643XX Ethernet support" - depends on MV64360 || MV64X60 || (PPC_MULTIPLATFORM && PPC32) + tristate "Marvell Discovery (643XX) and Orion ethernet support" + depends on MV64360 || MV64X60 || (PPC_MULTIPLATFORM && PPC32) || ARCH_ORION select MII help - This driver supports the gigabit Ethernet on the Marvell MV643XX - chipset which is used in the Momenco Ocelot C and Jaguar ATX and - Pegasos II, amongst other PPC and MIPS boards. + This driver supports the gigabit ethernet MACs in the + Marvell Discovery PPC/MIPS chipset family (MV643XX) and + in the Marvell Orion ARM SoC family. + + Some boards that use the Discovery chipset are the Momenco + Ocelot C and Jaguar ATX and Pegasos II. config QLA3XXX tristate "QLogic QLA3XXX Network Driver Support" |
