---

yaml
---
r: 7981
b: refs/heads/master
c: 0aa599c
h: refs/heads/master
i:
  7979: 386e4dd
v: v3

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 47ee3051c856cc2aa95d35d577a8cb37279d540f
+refs/heads/master: 0aa599c5644fddd3052433c5335260108a8a39a2

trunk/drivers/usb/net/Kconfig

@@ -140,23 +140,6 @@ config USB_PL2301
 comment "Intelligent USB Devices/Gadgets"
 	depends on USB_USBNET
 
-config USB_ZAURUS
-	boolean "Sharp Zaurus (stock ROMs) and compatible"
-	depends on USB_USBNET
-	select CRC32
-	default y
-	help
-	  Choose this option to support the usb networking links used by
-	  Zaurus models like the SL-5000D, SL-5500, SL-5600, A-300, B-500.
-	  This also supports some related device firmware, as used in some
-	  PDAs from Olympus and some cell phones from Motorola.
-
-	  If you install an alternate ROM image, such as the Linux 2.6 based
-	  versions of OpenZaurus, you should no longer need to support this
-	  protocol.  Only the "eth-fd" or "net_fd" drivers in these devices
-	  really need this non-conformant variant of CDC Ethernet (or in
-	  some cases CDC MDLM) protocol, not "g_ether".
-
 config USB_CDCETHER
 	boolean "CDC Ethernet support (smart devices such as cable modems)"
 	depends on USB_USBNET
@@ -294,6 +277,23 @@ config USB_EPSON2888
 	  Choose this option to support the usb networking links used
 	  by some sample firmware from Epson.
 
+config USB_NET_ZAURUS
+	tristate "Sharp Zaurus (stock ROMs) and compatible"
+	depends on USB_USBNET
+	select CRC32
+	default y
+	help
+	  Choose this option to support the usb networking links used by
+	  Zaurus models like the SL-5000D, SL-5500, SL-5600, A-300, B-500.
+	  This also supports some related device firmware, as used in some
+	  PDAs from Olympus and some cell phones from Motorola.
+
+	  If you install an alternate ROM image, such as the Linux 2.6 based
+	  versions of OpenZaurus, you should no longer need to support this
+	  protocol.  Only the "eth-fd" or "net_fd" drivers in these devices
+	  really need this non-conformant variant of CDC Ethernet (or in
+	  some cases CDC MDLM) protocol, not "g_ether".
+
 
 config USB_ZD1201
 	tristate "USB ZD1201 based Wireless device support"

trunk/drivers/usb/net/Makefile

@@ -10,5 +10,6 @@ obj-$(CONFIG_USB_NET_AX8817X)	+= asix.o
 obj-$(CONFIG_USB_NET_GL620A)	+= gl620a.o
 obj-$(CONFIG_USB_NET_NET1080)	+= net1080.o
 obj-$(CONFIG_USB_NET_CDC_SUBSET)	+= cdc_subset.o
+obj-$(CONFIG_USB_NET_ZAURUS)	+= zaurus.o
 obj-$(CONFIG_USB_USBNET)	+= usbnet.o
 obj-$(CONFIG_USB_ZD1201)	+= zd1201.o