diff options
| author | Jeff Garzik <jeff@garzik.org> | 2008-09-24 20:40:52 -0400 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@redhat.com> | 2008-09-24 20:40:52 -0400 |
| commit | ae19161e28a7b48d2752eff3ac8eb7703986c313 (patch) | |
| tree | 0d174e0ef02b0e21951dd40df6ebbfc320d11732 /drivers/net/Kconfig | |
| parent | 152cbcf94baec68b45832db5024184906ab798b1 (diff) | |
| parent | 042af53c7839282de15cc7fd7ad8ab938d74ab7c (diff) | |
Merge branch 'for-2.6.28' of git://git.marvell.com/mv643xx_eth into upstream-next
Diffstat (limited to 'drivers/net/Kconfig')
| -rw-r--r-- | drivers/net/Kconfig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig index 031b95b1f229..42b4eb703c2d 100644 --- a/drivers/net/Kconfig +++ b/drivers/net/Kconfig | |||
| @@ -2274,7 +2274,7 @@ config UGETH_TX_ON_DEMAND | |||
| 2274 | config MV643XX_ETH | 2274 | config MV643XX_ETH |
| 2275 | tristate "Marvell Discovery (643XX) and Orion ethernet support" | 2275 | tristate "Marvell Discovery (643XX) and Orion ethernet support" |
| 2276 | depends on MV64360 || MV64X60 || (PPC_MULTIPLATFORM && PPC32) || PLAT_ORION | 2276 | depends on MV64360 || MV64X60 || (PPC_MULTIPLATFORM && PPC32) || PLAT_ORION |
| 2277 | select MII | 2277 | select PHYLIB |
| 2278 | help | 2278 | help |
| 2279 | This driver supports the gigabit ethernet MACs in the | 2279 | This driver supports the gigabit ethernet MACs in the |
| 2280 | Marvell Discovery PPC/MIPS chipset family (MV643XX) and | 2280 | Marvell Discovery PPC/MIPS chipset family (MV643XX) and |