git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
This commit was manufactured by cvs2svn to create tag
[linux-2.6.git]
/
drivers
/
usb
/
net
/
Kconfig
diff --git
a/drivers/usb/net/Kconfig
b/drivers/usb/net/Kconfig
index
d64409e
..
5d5881d
100644
(file)
--- a/
drivers/usb/net/Kconfig
+++ b/
drivers/usb/net/Kconfig
@@
-1,15
+1,15
@@
#
# USB Network devices configuration
#
#
# USB Network devices configuration
#
-comment "
Networking support is needed for USB Network Adapter support
"
- depends on USB
&& !NET
+comment "
USB Network adaptors
"
+ depends on USB
-
menu "USB Network Adapters
"
- depends on USB && NET
+
comment "Networking support is needed for USB Networking device support
"
+ depends on USB &&
!
NET
config USB_CATC
tristate "USB CATC NetMate-based Ethernet device support (EXPERIMENTAL)"
config USB_CATC
tristate "USB CATC NetMate-based Ethernet device support (EXPERIMENTAL)"
- depends on EXPERIMENTAL
+ depends on
USB && NET &&
EXPERIMENTAL
select CRC32
---help---
Say Y if you want to use one of the following 10Mbps USB Ethernet
select CRC32
---help---
Say Y if you want to use one of the following 10Mbps USB Ethernet
@@
-29,6
+29,7
@@
config USB_CATC
config USB_KAWETH
tristate "USB KLSI KL5USB101-based ethernet device support"
config USB_KAWETH
tristate "USB KLSI KL5USB101-based ethernet device support"
+ depends on USB && NET
---help---
Say Y here if you want to use one of the following 10Mbps only
USB Ethernet adapters based on the KLSI KL5KUSB101B chipset:
---help---
Say Y here if you want to use one of the following 10Mbps only
USB Ethernet adapters based on the KLSI KL5KUSB101B chipset:
@@
-68,6
+69,7
@@
config USB_KAWETH
config USB_PEGASUS
tristate "USB Pegasus/Pegasus-II based ethernet device support"
config USB_PEGASUS
tristate "USB Pegasus/Pegasus-II based ethernet device support"
+ depends on USB && NET
select MII
---help---
Say Y here if you know you have Pegasus or Pegasus-II based adapter.
select MII
---help---
Say Y here if you know you have Pegasus or Pegasus-II based adapter.
@@
-83,7
+85,7
@@
config USB_PEGASUS
config USB_RTL8150
tristate "USB RTL8150 based ethernet device support (EXPERIMENTAL)"
config USB_RTL8150
tristate "USB RTL8150 based ethernet device support (EXPERIMENTAL)"
- depends on EXPERIMENTAL
+ depends on
USB && NET &&
EXPERIMENTAL
help
Say Y here if you have RTL8150 based usb-ethernet adapter.
Send me <petkan@users.sourceforge.net> any comments you may have.
help
Say Y here if you have RTL8150 based usb-ethernet adapter.
Send me <petkan@users.sourceforge.net> any comments you may have.
@@
-94,6
+96,7
@@
config USB_RTL8150
config USB_USBNET
tristate "Multi-purpose USB Networking Framework"
config USB_USBNET
tristate "Multi-purpose USB Networking Framework"
+ depends on USB && NET
---help---
This driver supports several kinds of network links over USB,
with "minidrivers" built around a common network driver core
---help---
This driver supports several kinds of network links over USB,
with "minidrivers" built around a common network driver core
@@
-182,14
+185,6
@@
config USB_PL2301
Choose this option if you're using a host-to-host cable
with one of these chips.
Choose this option if you're using a host-to-host cable
with one of these chips.
-config USB_KC2190
- boolean "KT Technology KC2190 based cables (InstaNet)"
- default y
- depends on USB_USBNET && EXPERIMENTAL
- help
- Choose this option if you're using a host-to-host cable
- with one of these chips.
-
comment "Intelligent USB Devices/Gadgets"
depends on USB_USBNET
comment "Intelligent USB Devices/Gadgets"
depends on USB_USBNET
@@
-203,9
+198,6
@@
config USB_ARMLINUX
such as the SA-11x0 and PXA-25x UDCs, or the tftp capabilities
in some PXA versions of the "blob" boot loader.
such as the SA-11x0 and PXA-25x UDCs, or the tftp capabilities
in some PXA versions of the "blob" boot loader.
- Linux-based "Gumstix" PXA-25x based systems use this protocol
- to talk with other Linux systems.
-
Although the ROMs shipped with Sharp Zaurus products use a
different link level framing protocol, you can have them use
this simpler protocol by installing a different kernel.
Although the ROMs shipped with Sharp Zaurus products use a
different link level framing protocol, you can have them use
this simpler protocol by installing a different kernel.
@@
-266,20
+258,17
@@
config USB_AX8817X
select MII
default y
help
select MII
default y
help
+
This option adds support for ASIX AX88172 based USB 2.0
10/100 Ethernet devices.
This driver should work with at least the following devices:
* Aten UC210T
* ASIX AX88172
This option adds support for ASIX AX88172 based USB 2.0
10/100 Ethernet devices.
This driver should work with at least the following devices:
* Aten UC210T
* ASIX AX88172
- * Billionton Systems, USB2AR
- * Buffalo LUA-U2-KTX
- * Corega FEther USB2-TX
* D-Link DUB-E100
* Hawking UF200
* Linksys USB200M
* Netgear FA120
* D-Link DUB-E100
* Hawking UF200
* Linksys USB200M
* Netgear FA120
- * Sitecom LN-029
* Intellinet USB 2.0 Ethernet
* ST Lab USB 2.0 Ethernet
* TrendNet TU2-ET100
* Intellinet USB 2.0 Ethernet
* ST Lab USB 2.0 Ethernet
* TrendNet TU2-ET100
@@
-287,4
+276,4
@@
config USB_AX8817X
This driver creates an interface named "ethX", where X depends on
what other networking devices you have in use.
This driver creates an interface named "ethX", where X depends on
what other networking devices you have in use.
-endmenu
+