diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2005-11-09 11:34:36 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-11-09 11:34:36 -0500 |
| commit | a7c243b544c0e9f6775c2607decaa59d54fb9e11 (patch) | |
| tree | 86fdb4d2d6cef932af7497f28827e7d52b29e48c /drivers/net/Kconfig | |
| parent | 7df446e7e043b2ba5fd5de42529f9d797e8b501a (diff) | |
| parent | f406db8cba6bbce42b96490e6d31bdec229ad994 (diff) | |
Merge branch 'upstream-linus' 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 24f1691b84f9..5c69d57f8548 100644 --- a/drivers/net/Kconfig +++ b/drivers/net/Kconfig | |||
| @@ -447,7 +447,7 @@ config NET_SB1250_MAC | |||
| 447 | 447 | ||
| 448 | config SGI_IOC3_ETH | 448 | config SGI_IOC3_ETH |
| 449 | bool "SGI IOC3 Ethernet" | 449 | bool "SGI IOC3 Ethernet" |
| 450 | depends on NET_ETHERNET && PCI && SGI_IP27 && BROKEN | 450 | depends on NET_ETHERNET && PCI && SGI_IP27 |
| 451 | select CRC32 | 451 | select CRC32 |
| 452 | select MII | 452 | select MII |
| 453 | help | 453 | help |