diff options
| author | Linus Torvalds <torvalds@evo.osdl.org> | 2005-09-02 03:53:36 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@evo.osdl.org> | 2005-09-02 03:53:36 -0400 |
| commit | 138307b475286a5bcc985b06b3e71fcd33dd5e2c (patch) | |
| tree | e025c7cb26396b07f157eea20a1cfb037b66758f /drivers/net | |
| parent | 66f3767376e2bbffb4c2c78ea171e1fdcb62201b (diff) | |
| parent | bc49a661e6e82bfa8219c3d0a2e4dea51c847d23 (diff) | |
Merge HEAD from master.kernel.org:/home/rmk/linux-2.6-serial
Diffstat (limited to 'drivers/net')
| -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 e0239a10d325..7d8bcb38797a 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 | 450 | depends on NET_ETHERNET && PCI && SGI_IP27 && BROKEN |
| 451 | select CRC32 | 451 | select CRC32 |
| 452 | select MII | 452 | select MII |
| 453 | help | 453 | help |