---

yaml
---
r: 7978
b: refs/heads/master
c: 2e55cc7
h: refs/heads/master
v: v3

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 38bde1d4699af45e6a4167a72e2e512e45c35ca8
+refs/heads/master: 2e55cc7210fef90f88201e860d8767594974574e

trunk/drivers/usb/net/Kconfig

@@ -202,23 +202,22 @@ config USB_CDCETHER
 	  IEEE 802 "local assignment" bit is set in the address, a "usbX"
 	  name is used instead.
 
-comment "USB Network Adapters"
-	depends on USB_USBNET
+comment "Drivers built using the usbnet core"
 
-config USB_AX8817X
-	boolean "ASIX AX88xxx Based USB 2.0 Ethernet Devices"
+config USB_NET_AX8817X
+	tristate "ASIX AX88xxx Based USB 2.0 Ethernet Adapters"
 	depends on USB_USBNET && NET_ETHERNET
 	select CRC32
 	select MII
 	default y
 	help
 	  This option adds support for ASIX AX88xxx based USB 2.0
-	  10/100 Ethernet devices.
+	  10/100 Ethernet adapters.
 
  	  This driver should work with at least the following devices:
 	    * Aten UC210T
 	    * ASIX AX88172
-	    * Billionton Systems, USB2AR 
+	    * Billionton Systems, USB2AR
 	    * Buffalo LUA-U2-KTX
 	    * Corega FEther USB2-TX
 	    * D-Link DUB-E100
@@ -231,7 +230,7 @@ config USB_AX8817X
 	    * TrendNet TU2-ET100
 
 	  This driver creates an interface named "ethX", where X depends on
-	  what other networking devices you have in use.  
+	  what other networking devices you have in use.
 
 
 config USB_NET_CDC_SUBSET

trunk/drivers/usb/net/Makefile

@@ -6,6 +6,7 @@ obj-$(CONFIG_USB_CATC)		+= catc.o
 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_CDC_SUBSET)	+= cdc_subset.o
 obj-$(CONFIG_USB_USBNET)	+= usbnet.o
 obj-$(CONFIG_USB_ZD1201)	+= zd1201.o