diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-01-09 12:39:05 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-01-09 12:39:05 -0500 |
| commit | cf10b2853f86e714eac7117484c0d368ce710fa4 (patch) | |
| tree | 6f1574a9de786c8c345ac852eff12d65b2d75bfe /drivers/net/Kconfig | |
| parent | 14591de147f7c9656fa2b9c05680d2b46e286c40 (diff) | |
| parent | 166c3436d683cfe5316c7723ed746a93db053f12 (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 | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig index 1960961bf28e..733bc25b2bf9 100644 --- a/drivers/net/Kconfig +++ b/drivers/net/Kconfig | |||
| @@ -129,7 +129,7 @@ config NET_SB1000 | |||
| 129 | 129 | ||
| 130 | If you don't have this card, of course say N. | 130 | If you don't have this card, of course say N. |
| 131 | 131 | ||
| 132 | source "drivers/net/arcnet/Kconfig" | 132 | source "drivers/net/arcnet/Kconfig" |
| 133 | 133 | ||
| 134 | source "drivers/net/phy/Kconfig" | 134 | source "drivers/net/phy/Kconfig" |
| 135 | 135 | ||
| @@ -844,7 +844,7 @@ config SMC9194 | |||
| 844 | 844 | ||
| 845 | config DM9000 | 845 | config DM9000 |
| 846 | tristate "DM9000 support" | 846 | tristate "DM9000 support" |
| 847 | depends on ARM && NET_ETHERNET | 847 | depends on (ARM || MIPS) && NET_ETHERNET |
| 848 | select CRC32 | 848 | select CRC32 |
| 849 | select MII | 849 | select MII |
| 850 | ---help--- | 850 | ---help--- |