more patches added

3 files changed, 36 insertions, 2 deletions

diff --git a/usb/usb-added-support-for-asix-88178-chipset-usb-gigabit-ethernet-adaptor.patch b/usb/usb-added-support-for-asix-88178-chipset-usb-gigabit-ethernet-adaptor.patch
new file mode 100644
index 0000000000000..b55ff74f0df2a
--- /dev/null
+++ b/usb/usb-added-support-for-asix-88178-chipset-usb-gigabit-ethernet-adaptor.patch
@@ -0,0 +1,34 @@
+From akpm@osdl.org Thu May 18 01:13:22 2006
+Message-Id: <200605180813.k4I8DG5e012968@shell0.pdx.osdl.net>
+From: Eduard Warkentin <eduard.warkentin@gmx.de>
+Subject: USB: added support for ASIX 88178 chipset USB Gigabit Ethernet adaptor
+To: eduard.warkentin@gmx.de, greg@kroah.com, mm-commits@vger.kernel.org
+Date: Thu, 18 May 2006 01:13:17 -0700
+
+From: Eduard Warkentin <eduard.warkentin@gmx.de>
+
+Add support for detection and dworking with a ASIX 88178 based USB-Gigabit
+adaptor.  With the patch, it is detected and handled correctly by the asix
+module.
+
+Signed-off-by: Andrew Morton <akpm@osdl.org>
+Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
+
+
+---
+ drivers/usb/net/asix.c |    4 ++++
+ 1 file changed, 4 insertions(+)
+
+--- gregkh-2.6.orig/drivers/usb/net/asix.c
++++ gregkh-2.6/drivers/usb/net/asix.c
+@@ -912,6 +912,10 @@ static const struct usb_device_id	produc
+         USB_DEVICE (0x0b95, 0x7720),
+         .driver_info = (unsigned long) &ax88772_info,
+ }, {
++	// ASIX AX88178 10/100/1000
++	USB_DEVICE (0x0b95, 0x1780),
++	.driver_info = (unsigned long) &ax88772_info,
++}, {
+ 	// Linksys USB200M Rev 2
+ 	USB_DEVICE (0x13b1, 0x0018),
+ 	.driver_info = (unsigned long) &ax88772_info,
diff --git a/usb/usb-serial-dynamic-id.patch b/usb/usb-serial-dynamic-id.patch
index 698ba043ec4c5..5741c7ad2fad9 100644
--- a/usb/usb-serial-dynamic-id.patch
+++ b/usb/usb-serial-dynamic-id.patch
@@ -315,7 +315,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  /**
   * struct usb_driver - identifies USB driver to usbcore
   * @name: The driver name should be unique among USB drivers,
-@@ -1190,6 +1202,7 @@ usb_maxpacket(struct usb_device *udev, i
+@@ -1192,6 +1204,7 @@ usb_maxpacket(struct usb_device *udev, i
  extern void usb_register_notify(struct notifier_block *nb);
  extern void usb_unregister_notify(struct notifier_block *nb);
  
diff --git a/usb/usb_interrupt_msg.patch b/usb/usb_interrupt_msg.patch
index d7cce20f2529b..a6a23f1e8bd82 100644
--- a/usb/usb_interrupt_msg.patch
+++ b/usb/usb_interrupt_msg.patch
@@ -56,7 +56,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
   *	@pipe: endpoint "pipe" to send the message to
 --- gregkh-2.6.orig/include/linux/usb.h
 +++ gregkh-2.6/include/linux/usb.h
-@@ -1021,6 +1021,8 @@ void usb_buffer_unmap_sg (struct usb_dev
+@@ -1009,6 +1009,8 @@ void usb_buffer_unmap_sg (struct usb_dev
  extern int usb_control_msg(struct usb_device *dev, unsigned int pipe,
  	__u8 request, __u8 requesttype, __u16 value, __u16 index,
  	void *data, __u16 size, int timeout);