diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2005-10-28 12:24:22 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-10-28 12:24:22 -0400 |
| commit | 83928e17b92b7a667bfe674f1b330619adc2ac88 (patch) | |
| tree | bdfc0fd037ad1380d75cefa0e47be24e344d977c /drivers/net/Kconfig | |
| parent | 9be16a03928642f944915b8c05945fd87b7a15cb (diff) | |
| parent | 50f4c001bc1534db77663592496204ceba151e97 (diff) | |
Merge master.kernel.org:/home/rmk/linux-2.6-arm
Minor manual fixups for gfp_t clashes.
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 5148d47492a0..fee8c5cf1f3a 100644 --- a/drivers/net/Kconfig +++ b/drivers/net/Kconfig | |||
| @@ -1338,7 +1338,7 @@ config FORCEDETH | |||
| 1338 | 1338 | ||
| 1339 | config CS89x0 | 1339 | config CS89x0 |
| 1340 | tristate "CS89x0 support" | 1340 | tristate "CS89x0 support" |
| 1341 | depends on (NET_PCI && (ISA || ARCH_IXDP2X01)) || ARCH_PNX0105 | 1341 | depends on (NET_PCI && (ISA || ARCH_IXDP2X01)) || ARCH_PNX0105 || MACH_MP1000 |
| 1342 | ---help--- | 1342 | ---help--- |
| 1343 | Support for CS89x0 chipset based Ethernet cards. If you have a | 1343 | Support for CS89x0 chipset based Ethernet cards. If you have a |
| 1344 | network (Ethernet) card of this type, say Y and read the | 1344 | network (Ethernet) card of this type, say Y and read the |