diff options
| author | David S. Miller <davem@davemloft.net> | 2008-08-07 05:10:27 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-08-07 05:10:27 -0400 |
| commit | 32bb93b02da8c75031e601ff1f9a25f99febbe5f (patch) | |
| tree | 429d2b978f517d366de572fa5058d513ed7b51a6 /drivers/net/Kconfig | |
| parent | 6edafaaf6f5e70ef1e620ff01bd6bacebe1e0718 (diff) | |
| parent | 3859069bc3358772b08bd91efe9edec39a746ea8 (diff) | |
Merge branch 'upstream-davem' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6
Diffstat (limited to 'drivers/net/Kconfig')
| -rw-r--r-- | drivers/net/Kconfig | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig index 8a03875ec877..4b4cb2bf4f11 100644 --- a/drivers/net/Kconfig +++ b/drivers/net/Kconfig | |||
| @@ -510,14 +510,15 @@ config STNIC | |||
| 510 | config SH_ETH | 510 | config SH_ETH |
| 511 | tristate "Renesas SuperH Ethernet support" | 511 | tristate "Renesas SuperH Ethernet support" |
| 512 | depends on SUPERH && \ | 512 | depends on SUPERH && \ |
| 513 | (CPU_SUBTYPE_SH7710 || CPU_SUBTYPE_SH7712 || CPU_SUBTYPE_SH7763) | 513 | (CPU_SUBTYPE_SH7710 || CPU_SUBTYPE_SH7712 || CPU_SUBTYPE_SH7763 || \ |
| 514 | CPU_SUBTYPE_SH7619) | ||
| 514 | select CRC32 | 515 | select CRC32 |
| 515 | select MII | 516 | select MII |
| 516 | select MDIO_BITBANG | 517 | select MDIO_BITBANG |
| 517 | select PHYLIB | 518 | select PHYLIB |
| 518 | help | 519 | help |
| 519 | Renesas SuperH Ethernet device driver. | 520 | Renesas SuperH Ethernet device driver. |
| 520 | This driver support SH7710, SH7712 and SH7763. | 521 | This driver support SH7710, SH7712, SH7763 and SH7619. |
| 521 | 522 | ||
| 522 | config SUNLANCE | 523 | config SUNLANCE |
| 523 | tristate "Sun LANCE support" | 524 | tristate "Sun LANCE support" |