From 46be7ea142d8f2205a2560c6d55fa7c22ffabe1c Mon Sep 17 00:00:00 2001 From: Lennert Buytenhek Date: Fri, 19 Oct 2007 04:11:03 +0200 Subject: [PATCH] --- yaml --- r: 72412 b: refs/heads/master c: 9c1bbdfe6f70eb9132829caa9341a0294c2aee5d h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/net/Kconfig | 13 ++++++++----- trunk/drivers/net/mv643xx_eth.c | 2 +- 3 files changed, 10 insertions(+), 7 deletions(-) diff --git a/[refs] b/[refs] index 55f7d37e842d..07ebb3362d77 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 9f316841440c4c7e59227d0a3fe00a31ead1c436 +refs/heads/master: 9c1bbdfe6f70eb9132829caa9341a0294c2aee5d diff --git a/trunk/drivers/net/Kconfig b/trunk/drivers/net/Kconfig index ce34b539bf38..eb75773a9ebb 100644 --- a/trunk/drivers/net/Kconfig +++ b/trunk/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" diff --git a/trunk/drivers/net/mv643xx_eth.c b/trunk/drivers/net/mv643xx_eth.c index 84f2d6382f1e..98dd90500422 100644 --- a/trunk/drivers/net/mv643xx_eth.c +++ b/trunk/drivers/net/mv643xx_eth.c @@ -1,5 +1,5 @@ /* - * drivers/net/mv643xx_eth.c - Driver for MV643XX ethernet ports + * Driver for Marvell Discovery (MV643XX) and Marvell Orion ethernet ports * Copyright (C) 2002 Matthew Dharm * * Based on the 64360 driver from: