brcm47xx: fix build of tg3 for kernel 2.6.34

[openwrt.git] / target / linux / generic-2.4 / patches / 802-usb_serial_3g_cards.patch

diff --git a/target/linux/generic-2.4/patches/802-usb_serial_3g_cards.patch b/target/linux/generic-2.4/patches/802-usb_serial_3g_cards.patch
index fbbb958..808e49c 100644 (file)
--- a/target/linux/generic-2.4/patches/802-usb_serial_3g_cards.patch
+++ b/target/linux/generic-2.4/patches/802-usb_serial_3g_cards.patch
@@ -1,15 +1,15 @@
---- linux/drivers/usb/serial/usbserial.c.old   2006-05-15 18:16:55.000000000 +0300
-+++ linux/drivers/usb/serial/usbserial.c       2006-05-15 18:19:06.000000000 +0300
-@@ -332,7 +332,7 @@
- static __u16  vendor  = 0x05f9;
+--- a/drivers/usb/serial/usbserial.c
++++ b/drivers/usb/serial/usbserial.c
+@@ -333,7 +333,7 @@ static __u16       vendor  = 0x05f9;

  static __u16  product = 0xffff;
  static __u16  product = 0xffff;

+ static int    maxSize = 0;

  
 -static struct usb_device_id generic_device_ids[2]; /* Initially all zeroes. */
  
 -static struct usb_device_id generic_device_ids[2]; /* Initially all zeroes. */

-+static struct usb_device_id generic_device_ids[10]; /* Initially all zeroes. */
++static struct usb_device_id generic_device_ids[9]; /* Initially all zeroes. */

  
  /* All of the device info needed for the Generic Serial Converter */
  static struct usb_serial_device_type generic_device = {
  
  /* All of the device info needed for the Generic Serial Converter */
  static struct usb_serial_device_type generic_device = {

-@@ -1793,6 +1793,34 @@
+@@ -1836,6 +1836,30 @@ static int __init usb_serial_init(void)

        generic_device_ids[0].idVendor = vendor;
        generic_device_ids[0].idProduct = product;
        generic_device_ids[0].match_flags = USB_DEVICE_ID_MATCH_VENDOR | USB_DEVICE_ID_MATCH_PRODUCT;
        generic_device_ids[0].idVendor = vendor;
        generic_device_ids[0].idProduct = product;
        generic_device_ids[0].match_flags = USB_DEVICE_ID_MATCH_VENDOR | USB_DEVICE_ID_MATCH_PRODUCT;


@@ -29,10 +29,6 @@
 +      generic_device_ids[4].idVendor = 0x0f3d;
 +      generic_device_ids[4].idProduct = 0x0112;
 +      generic_device_ids[4].match_flags = USB_DEVICE_ID_MATCH_VENDOR | USB_DEVICE_ID_MATCH_PRODUCT;
 +      generic_device_ids[4].idVendor = 0x0f3d;
 +      generic_device_ids[4].idProduct = 0x0112;
 +      generic_device_ids[4].match_flags = USB_DEVICE_ID_MATCH_VENDOR | USB_DEVICE_ID_MATCH_PRODUCT;

-+      /* Sierra Wireless AirCard 875 */
-+      generic_device_ids[5].idVendor = 0x1199;
-+      generic_device_ids[5].idProduct = 0x6820;
-+      generic_device_ids[5].match_flags = USB_DEVICE_ID_MATCH_VENDOR | USB_DEVICE_ID_MATCH_PRODUCT;

 +      /* Huawei E600 */
 +      generic_device_ids[6].idVendor = 0x12d1;
 +      generic_device_ids[6].idProduct = 0x1001;
 +      /* Huawei E600 */
 +      generic_device_ids[6].idVendor = 0x12d1;
 +      generic_device_ids[6].idProduct = 0x1001;