diff options
| author | David S. Miller <davem@davemloft.net> | 2008-06-12 16:14:22 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-06-12 16:14:22 -0700 |
| commit | 030352a9c7715780b2c01033ae9afe56249bb7cc (patch) | |
| tree | cc23683773d0d63712f4e6ea6824383f1d696e05 /drivers/net/Kconfig | |
| parent | e6e30add6bd8115af108de2a13ec82d997a55777 (diff) | |
| parent | 0c1aa20fb87b796d904f4d89ad12e5a0c483127b (diff) | |
Merge branch 'davem-next' 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 | 14 |
1 files changed, 13 insertions, 1 deletions
diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig index c537f53ffcb..40eb24d6d75 100644 --- a/drivers/net/Kconfig +++ b/drivers/net/Kconfig @@ -524,6 +524,18 @@ config STNIC If unsure, say N. +config SH_ETH + tristate "Renesas SuperH Ethernet support" + depends on SUPERH && \ + (CPU_SUBTYPE_SH7710 || CPU_SUBTYPE_SH7712) + select CRC32 + select MII + select MDIO_BITBANG + select PHYLIB + help + Renesas SuperH Ethernet device driver. + This driver support SH7710 and SH7712. + config SUNLANCE tristate "Sun LANCE support" depends on SBUS @@ -955,7 +967,7 @@ config SMC911X tristate "SMSC LAN911[5678] support" select CRC32 select MII - depends on ARCH_PXA || SH_MAGIC_PANEL_R2 + depends on ARCH_PXA || SUPERH help This is a driver for SMSC's LAN911x series of Ethernet chipsets including the new LAN9115, LAN9116, LAN9117, and LAN9118. |