diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2005-10-28 18:48:57 -0400 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-10-28 18:48:57 -0400 |
| commit | 596c96ba06e5d56e72451e02f93f4e15e17458df (patch) | |
| tree | 78bc640acacb8faeb621c51296e99dbb0533a147 /drivers/net/Kconfig | |
| parent | ad18b0ea089928367185e13d11424aea91d4b41f (diff) | |
| parent | 20731945ae743034353a88c307920d1f16cf8ac8 (diff) | |
Merge branch 'master'
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 54ab70e7eff4..6d4f9ceb0a32 100644 --- a/drivers/net/Kconfig +++ b/drivers/net/Kconfig | |||
| @@ -1374,7 +1374,7 @@ config FORCEDETH | |||
| 1374 | 1374 | ||
| 1375 | config CS89x0 | 1375 | config CS89x0 |
| 1376 | tristate "CS89x0 support" | 1376 | tristate "CS89x0 support" |
| 1377 | depends on (NET_PCI && ISA) || ARCH_PNX0105 || ARCH_IXDP2X01 | 1377 | depends on (NET_PCI && (ISA || ARCH_IXDP2X01)) || ARCH_PNX0105 || MACH_MP1000 |
| 1378 | ---help--- | 1378 | ---help--- |
| 1379 | Support for CS89x0 chipset based Ethernet cards. If you have a | 1379 | Support for CS89x0 chipset based Ethernet cards. If you have a |
| 1380 | network (Ethernet) card of this type, say Y and read the | 1380 | network (Ethernet) card of this type, say Y and read the |