diff options
| author | David S. Miller <davem@davemloft.net> | 2008-08-14 17:50:46 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-08-14 17:50:46 -0400 |
| commit | b793b3a75e12ae4576f3d9b6013c8a7d8b0277b8 (patch) | |
| tree | e493685833f06462afd5d4edc6e231c33131a633 /drivers/net/Kconfig | |
| parent | b635acec48bcaa9183fcbf4e3955616b0d4119b5 (diff) | |
| parent | c0912585ec8b64d846d56995241f2c8a7f48ee75 (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 | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig index 4b4cb2bf4f11..a5c141cecd4e 100644 --- a/drivers/net/Kconfig +++ b/drivers/net/Kconfig | |||
| @@ -1172,7 +1172,7 @@ config ETH16I | |||
| 1172 | 1172 | ||
| 1173 | config NE2000 | 1173 | config NE2000 |
| 1174 | tristate "NE2000/NE1000 support" | 1174 | tristate "NE2000/NE1000 support" |
| 1175 | depends on NET_ISA || (Q40 && m) || M32R || TOSHIBA_RBTX4927 || TOSHIBA_RBTX4938 | 1175 | depends on NET_ISA || (Q40 && m) || M32R || MACH_TX49XX |
| 1176 | select CRC32 | 1176 | select CRC32 |
| 1177 | ---help--- | 1177 | ---help--- |
| 1178 | If you have a network (Ethernet) card of this type, say Y and read | 1178 | If you have a network (Ethernet) card of this type, say Y and read |