diff options
| author | Linus Torvalds <torvalds@evo.osdl.org> | 2005-09-06 00:47:18 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@evo.osdl.org> | 2005-09-06 00:47:18 -0700 |
| commit | 5bcaa155797ab62ed363932ec0f02fbcb5db1ef1 (patch) | |
| tree | 1db633712bd47ce72ac5a1aed62b3417733ac63a /drivers/net/Kconfig | |
| parent | 1e231efe50ffe4d291be24d2fe393188de9c4b08 (diff) | |
| parent | 3a48c4c2d52a08e12319ab7caacad0a9b88e6cb4 (diff) | |
| download | linux-stable-5bcaa155797ab62ed363932ec0f02fbcb5db1ef1.tar.gz | |
Merge branch 'upstream' 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 | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig index 7d8bcb38797a..ae9e7a579b94 100644 --- a/drivers/net/Kconfig +++ b/drivers/net/Kconfig @@ -397,7 +397,7 @@ config SUN3LANCE If you're not building a kernel for a Sun 3, say N. config SUN3_82586 - tristate "Sun3 on-board Intel 82586 support" + bool "Sun3 on-board Intel 82586 support" depends on NET_ETHERNET && SUN3 help This driver enables support for the on-board Intel 82586 based @@ -1924,12 +1924,15 @@ config R8169_VLAN If in doubt, say Y. config SIS190 - tristate "SiS190 gigabit ethernet support" + tristate "SiS190/SiS191 gigabit ethernet support" depends on PCI select CRC32 select MII ---help--- - Say Y here if you have a SiS 190 PCI Gigabit Ethernet adapter. + Say Y here if you have a SiS 190 PCI Fast Ethernet adapter or + a SiS 191 PCI Gigabit Ethernet adapter. Both are expected to + appear in lan on motherboard designs which are based on SiS 965 + and SiS 966 south bridge. To compile this driver as a module, choose M here: the module will be called sis190. This is recommended. |