diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2005-10-28 18:24:22 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-10-28 18:24:22 +0200 |
| commit | 83928e17b92b7a667bfe674f1b330619adc2ac88 (patch) | |
| tree | bdfc0fd037ad1380d75cefa0e47be24e344d977c /drivers/net/Kconfig | |
| parent | Merge branch 'sx8' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/mis... (diff) | |
| parent | [ARM] 3042/1: AAED-2000 - LCD panel informations (diff) | |
| download | linux-83928e17b92b7a667bfe674f1b330619adc2ac88.tar.xz linux-83928e17b92b7a667bfe674f1b330619adc2ac88.zip | |
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 config CS89x0 tristate "CS89x0 support" - depends on (NET_PCI && (ISA || ARCH_IXDP2X01)) || ARCH_PNX0105 + depends on (NET_PCI && (ISA || ARCH_IXDP2X01)) || ARCH_PNX0105 || MACH_MP1000 ---help--- Support for CS89x0 chipset based Ethernet cards. If you have a network (Ethernet) card of this type, say Y and read the |