diff options
author | Lennert Buytenhek <buytenh@wantstofly.org> | 2007-10-18 22:11:03 -0400 |
---|---|---|
committer | Dale Farnsworth <dale@farnsworth.org> | 2007-10-23 11:23:03 -0400 |
commit | 9c1bbdfe6f70eb9132829caa9341a0294c2aee5d (patch) | |
tree | a81d9d52ed122273812327be22a5aaed44e0015c | |
parent | 9f316841440c4c7e59227d0a3fe00a31ead1c436 (diff) |
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>
-rw-r--r-- | drivers/net/Kconfig | 13 | ||||
-rw-r--r-- | drivers/net/mv643xx_eth.c | 2 |
2 files changed, 9 insertions, 6 deletions
diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig index ce34b539bf38..eb75773a9ebb 100644 --- a/drivers/net/Kconfig +++ b/drivers/net/Kconfig | |||
@@ -2371,13 +2371,16 @@ config UGETH_TX_ON_DEMAND | |||
2371 | depends on UCC_GETH | 2371 | depends on UCC_GETH |
2372 | 2372 | ||
2373 | config MV643XX_ETH | 2373 | config MV643XX_ETH |
2374 | tristate "MV-643XX Ethernet support" | 2374 | tristate "Marvell Discovery (643XX) and Orion ethernet support" |
2375 | depends on MV64360 || MV64X60 || (PPC_MULTIPLATFORM && PPC32) | 2375 | depends on MV64360 || MV64X60 || (PPC_MULTIPLATFORM && PPC32) || ARCH_ORION |
2376 | select MII | 2376 | select MII |
2377 | help | 2377 | help |
2378 | This driver supports the gigabit Ethernet on the Marvell MV643XX | 2378 | This driver supports the gigabit ethernet MACs in the |
2379 | chipset which is used in the Momenco Ocelot C and Jaguar ATX and | 2379 | Marvell Discovery PPC/MIPS chipset family (MV643XX) and |
2380 | Pegasos II, amongst other PPC and MIPS boards. | 2380 | in the Marvell Orion ARM SoC family. |
2381 | |||
2382 | Some boards that use the Discovery chipset are the Momenco | ||
2383 | Ocelot C and Jaguar ATX and Pegasos II. | ||
2381 | 2384 | ||
2382 | config QLA3XXX | 2385 | config QLA3XXX |
2383 | tristate "QLogic QLA3XXX Network Driver Support" | 2386 | tristate "QLogic QLA3XXX Network Driver Support" |
diff --git a/drivers/net/mv643xx_eth.c b/drivers/net/mv643xx_eth.c index 84f2d6382f1e..98dd90500422 100644 --- a/drivers/net/mv643xx_eth.c +++ b/drivers/net/mv643xx_eth.c | |||
@@ -1,5 +1,5 @@ | |||
1 | /* | 1 | /* |
2 | * drivers/net/mv643xx_eth.c - Driver for MV643XX ethernet ports | 2 | * Driver for Marvell Discovery (MV643XX) and Marvell Orion ethernet ports |
3 | * Copyright (C) 2002 Matthew Dharm <mdharm@momenco.com> | 3 | * Copyright (C) 2002 Matthew Dharm <mdharm@momenco.com> |
4 | * | 4 | * |
5 | * Based on the 64360 driver from: | 5 | * Based on the 64360 driver from: |