diff options
| author | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-05-26 13:27:39 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-05-26 13:27:39 -0400 |
| commit | f49809fe9b39e22b0f6f75c86295ce216ce3e374 (patch) | |
| tree | 05f8c05ee71307c9ab02663cfaa5f08a21c6629f /drivers/net/Kconfig | |
| parent | cdbbde14cb55dd10771ce79154f787322d88411b (diff) | |
| parent | c1ef1f351db70ad60c793b8218dd9f6739cfd66d (diff) | |
Automatic merge of 'for-linus' branch from
rsync://rsync.kernel.org/pub/scm/linux/kernel/git/jgarzik/netdev-2.6
Diffstat (limited to 'drivers/net/Kconfig')
| -rw-r--r-- | drivers/net/Kconfig | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig index 3a0a55b62aaf..7c5c1acd1474 100644 --- a/drivers/net/Kconfig +++ b/drivers/net/Kconfig | |||
| @@ -1555,6 +1555,7 @@ config SIS900 | |||
| 1555 | tristate "SiS 900/7016 PCI Fast Ethernet Adapter support" | 1555 | tristate "SiS 900/7016 PCI Fast Ethernet Adapter support" |
| 1556 | depends on NET_PCI && PCI | 1556 | depends on NET_PCI && PCI |
| 1557 | select CRC32 | 1557 | select CRC32 |
| 1558 | select MII | ||
| 1558 | ---help--- | 1559 | ---help--- |
| 1559 | This is a driver for the Fast Ethernet PCI network cards based on | 1560 | This is a driver for the Fast Ethernet PCI network cards based on |
| 1560 | the SiS 900 and SiS 7016 chips. The SiS 900 core is also embedded in | 1561 | the SiS 900 and SiS 7016 chips. The SiS 900 core is also embedded in |