diff options
| author | Jeff Garzik <jeff@garzik.org> | 2008-09-25 02:40:52 +0200 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@redhat.com> | 2008-09-25 02:40:52 +0200 |
| commit | ae19161e28a7b48d2752eff3ac8eb7703986c313 (patch) | |
| tree | 0d174e0ef02b0e21951dd40df6ebbfc320d11732 /drivers/net/Kconfig | |
| parent | Merge branch 'davem-next' of master.kernel.org:/pub/scm/linux/kernel/git/jgar... (diff) | |
| parent | mv643xx_eth: bump version to 1.4 (diff) | |
| download | linux-ae19161e28a7b48d2752eff3ac8eb7703986c313.tar.xz linux-ae19161e28a7b48d2752eff3ac8eb7703986c313.zip | |
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 config MV643XX_ETH tristate "Marvell Discovery (643XX) and Orion ethernet support" depends on MV64360 || MV64X60 || (PPC_MULTIPLATFORM && PPC32) || PLAT_ORION - select MII + select PHYLIB help This driver supports the gigabit ethernet MACs in the Marvell Discovery PPC/MIPS chipset family (MV643XX) and |