diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2005-08-30 20:16:30 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-08-30 20:16:30 +0200 |
| commit | 6b39374a27eb4be7e9d82145ae270ba02ea90dc8 (patch) | |
| tree | 09933113cf28f253db1dd539463bdab741d67139 /drivers/net/tulip/Kconfig | |
| parent | [PATCH] ppc32 8xx: fix warnings in m8xx_setup.c (diff) | |
| parent | Merge HEAD from /spare/repo/linux-2.6/.git (diff) | |
| download | linux-6b39374a27eb4be7e9d82145ae270ba02ea90dc8.tar.xz linux-6b39374a27eb4be7e9d82145ae270ba02ea90dc8.zip | |
Merge refs/heads/upstream from master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6.git
Diffstat (limited to 'drivers/net/tulip/Kconfig')
| -rw-r--r-- | drivers/net/tulip/Kconfig | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/drivers/net/tulip/Kconfig b/drivers/net/tulip/Kconfig index e2cdaf876201..8c9634a98c11 100644 --- a/drivers/net/tulip/Kconfig +++ b/drivers/net/tulip/Kconfig @@ -135,6 +135,18 @@ config DM9102 <file:Documentation/networking/net-modules.txt>. The module will be called dmfe. +config ULI526X + tristate "ULi M526x controller support" + depends on NET_TULIP && PCI + select CRC32 + ---help--- + This driver is for ULi M5261/M5263 10/100M Ethernet Controller + (<http://www.uli.com.tw/>). + + To compile this driver as a module, choose M here and read + <file:Documentation/networking/net-modules.txt>. The module will + be called uli526x. + config PCMCIA_XIRCOM tristate "Xircom CardBus support (new driver)" depends on NET_TULIP && CARDBUS |