Merge commit 'main-jb-2012.08.03-B4' into t114-0806
[linux-2.6.git] / drivers / net / usb / cdc_ether.c
index e3c2de3..cc73c09 100644 (file)
@@ -625,6 +625,14 @@ static const struct usb_device_id  products [] = {
        USB_DEVICE(0x0489,0xE03A),
        .driver_info = (unsigned long)&rmnet_info,
 },
+
+/* ZM5250 */
+{
+       .match_flags = USB_DEVICE_ID_MATCH_INT_INFO
+                | USB_DEVICE_ID_MATCH_DEVICE,
+       USB_DEVICE(0x19D2,0x1554),
+       .driver_info = (unsigned long)&rmnet_info,
+},
 /*
  * WHITELIST!!!
  *