diff options
| author | Kumar Gala <galak@kernel.crashing.org> | 2006-03-20 17:53:56 +0100 |
|---|---|---|
| committer | Kumar Gala <galak@kernel.crashing.org> | 2006-03-20 17:53:56 +0100 |
| commit | 61c5504a0ed66c8b460f9a006eedaea2ee587e33 (patch) | |
| tree | 2cf21d235f17e80d47fdb4ee1248865be8196d4d /drivers/net/Kconfig | |
| parent | Merge branch 'master' of git+ssh://galak@master.kernel.org/pub/scm/linux/kern... (diff) | |
| parent | [PATCH] powerpc: Fix bug in bug fix for bug in lmb_alloc() (diff) | |
| download | linux-61c5504a0ed66c8b460f9a006eedaea2ee587e33.tar.xz linux-61c5504a0ed66c8b460f9a006eedaea2ee587e33.zip | |
Merge branch 'master'
Diffstat (limited to 'drivers/net/Kconfig')
| -rw-r--r-- | drivers/net/Kconfig | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig index e45a8f959719..8c1ad0fac7b6 100644 --- a/drivers/net/Kconfig +++ b/drivers/net/Kconfig @@ -1087,7 +1087,8 @@ config NE2000 without a specific driver are compatible with NE2000. If you have a PCI NE2000 card however, say N here and Y to "PCI - NE2000 support", above. If you have a NE2000 card and are running on + NE2000 and clone support" under "EISA, VLB, PCI and on board + controllers" below. If you have a NE2000 card and are running on an MCA system (a bus system used on some IBM PS/2 computers and laptops), say N here and Y to "NE/2 (ne2000 MCA version) support", below. @@ -2175,6 +2176,7 @@ config BNX2 config SPIDER_NET tristate "Spider Gigabit Ethernet driver" depends on PCI && PPC_CELL + select FW_LOADER help This driver supports the Gigabit Ethernet chips present on the Cell Processor-Based Blades from IBM. |