---

yaml --- r: 7979 b: refs/heads/master c: 904813c h: refs/heads/master i: 7977: 5ea3b96 7975: 198a3f2 v: v3
git-mirror · Sep 8, 2005 · 386e4dd · 386e4dd
1 parent a52616a
commit 386e4dd
Show file tree

Hide file tree

Showing 5 changed files with 633 additions and 581 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2e55cc7210fef90f88201e860d8767594974574e
+refs/heads/master: 904813cd8a0b334189da285bb05af0b18b062502
diff --git a/trunk/drivers/usb/net/Kconfig b/trunk/drivers/usb/net/Kconfig
@@ -138,15 +138,6 @@ config USB_GENESYS
 
 	  Note that the half-duplex "GL620USB" is not supported.
 
-config USB_NET1080
-	boolean "NetChip 1080 based cables (Laplink, ...)"
-	default y
-	depends on USB_USBNET
-	help
-	  Choose this option if you're using a host-to-host cable based
-	  on this design:  one NetChip 1080 chips and supporting logic,
-	  supporting LEDs that indicate traffic
-
 config USB_PL2301
 	boolean "Prolific PL-2301/2302 based cables"
 	default y
@@ -233,6 +224,15 @@ config USB_NET_AX8817X
 	  what other networking devices you have in use.
 
 
+config USB_NET_NET1080
+	tristate "NetChip 1080 based cables (Laplink, ...)"
+	default y
+	depends on USB_USBNET
+	help
+	  Choose this option if you're using a host-to-host cable based
+	  on this design:  one NetChip 1080 chip and supporting logic,
+	  optionally with LEDs that indicate traffic
+
 config USB_NET_CDC_SUBSET
 	tristate "Simple USB Network Links (CDC Ethernet subset)"
 	depends on USB_USBNET

diff --git a/trunk/drivers/usb/net/Makefile b/trunk/drivers/usb/net/Makefile
@@ -7,6 +7,7 @@ obj-$(CONFIG_USB_KAWETH)	+= kaweth.o
 obj-$(CONFIG_USB_PEGASUS)	+= pegasus.o
 obj-$(CONFIG_USB_RTL8150)	+= rtl8150.o
 obj-$(CONFIG_USB_NET_AX8817X)	+= asix.o
+obj-$(CONFIG_USB_NET_NET1080)	+= net1080.o
 obj-$(CONFIG_USB_NET_CDC_SUBSET)	+= cdc_subset.o
 obj-$(CONFIG_USB_USBNET)	+= usbnet.o
 obj-$(CONFIG_USB_ZD1201)	+= zd1201.o