diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2005-10-04 05:30:02 -0400 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-10-04 05:30:02 -0400 |
| commit | d9e34325fd62310b7b49243d02b774f3ef2452db (patch) | |
| tree | d356eab72377f2576ad356de66daec23f28529a5 /drivers/net/Kconfig | |
| parent | 500f83abdc83d6bd472f3d103a9a9cd85df29a29 (diff) | |
| parent | 832f8f0378ff1566f2a222352c7ad5df3f8d0d9d (diff) | |
| download | talos-obmc-linux-d9e34325fd62310b7b49243d02b774f3ef2452db.tar.gz talos-obmc-linux-d9e34325fd62310b7b49243d02b774f3ef2452db.zip | |
Merge branch 'upstream-fixes'
Diffstat (limited to 'drivers/net/Kconfig')
| -rw-r--r-- | drivers/net/Kconfig | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig index 018b11a7a4ce..0a30368d2efc 100644 --- a/drivers/net/Kconfig +++ b/drivers/net/Kconfig @@ -1655,7 +1655,7 @@ config LAN_SAA9730 config NET_POCKET bool "Pocket and portable adapters" - depends on NET_ETHERNET && ISA + depends on NET_ETHERNET && PARPORT ---help--- Cute little network (Ethernet) devices which attach to the parallel port ("pocket adapters"), commonly used with laptops. If you have @@ -1679,7 +1679,7 @@ config NET_POCKET config ATP tristate "AT-LAN-TEC/RealTek pocket adapter support" - depends on NET_POCKET && ISA && X86 + depends on NET_POCKET && PARPORT && X86 select CRC32 ---help--- This is a network (Ethernet) device which attaches to your parallel @@ -1694,7 +1694,7 @@ config ATP config DE600 tristate "D-Link DE600 pocket adapter support" - depends on NET_POCKET && ISA + depends on NET_POCKET && PARPORT ---help--- This is a network (Ethernet) device which attaches to your parallel port. Read <file:Documentation/networking/DLINK.txt> as well as the @@ -1709,7 +1709,7 @@ config DE600 config DE620 tristate "D-Link DE620 pocket adapter support" - depends on NET_POCKET && ISA + depends on NET_POCKET && PARPORT ---help--- This is a network (Ethernet) device which attaches to your parallel port. Read <file:Documentation/networking/DLINK.txt> as well as the |
