aboutsummaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorLennert Buytenhek <buytenh@wantstofly.org>2007-10-19 04:11:03 +0200
committerDale Farnsworth <dale@farnsworth.org>2007-10-23 08:23:03 -0700
commit9c1bbdfe6f70eb9132829caa9341a0294c2aee5d (patch)
treea81d9d52ed122273812327be22a5aaed44e0015c /drivers
parent9f316841440c4c7e59227d0a3fe00a31ead1c436 (diff)
downloadkernel_samsung_espresso10-9c1bbdfe6f70eb9132829caa9341a0294c2aee5d.zip
kernel_samsung_espresso10-9c1bbdfe6f70eb9132829caa9341a0294c2aee5d.tar.gz
kernel_samsung_espresso10-9c1bbdfe6f70eb9132829caa9341a0294c2aee5d.tar.bz2
mv643xx_eth: Enable use on Orion platforms
Allow Orion ARM platforms to use the mv643xx_eth driver. Signed-off-by: Lennert Buytenhek <buytenh@marvell.com> Acked-by: Tzachi Perelstein <tzachi@marvell.com> Signed-off-by: Dale Farnsworth <dale@farnsworth.org>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/net/Kconfig13
-rw-r--r--drivers/net/mv643xx_eth.c2
2 files changed, 9 insertions, 6 deletions
diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig
index ce34b53..eb75773 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"
diff --git a/drivers/net/mv643xx_eth.c b/drivers/net/mv643xx_eth.c
index 84f2d63..98dd905 100644
--- a/drivers/net/mv643xx_eth.c
+++ b/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 <mdharm@momenco.com>
*
* Based on the 64360 driver from: