Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 311779
b: refs/heads/master
c: 8e16e33
h: refs/heads/master
i:
  311777: 599971b
  311775: c785cf4
v: v3
  • Loading branch information
Bjørn Mork authored and Greg Kroah-Hartman committed Jul 5, 2012
1 parent 0f718d3 commit fe88de3
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 1 deletion.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: d25ae36934e39fb902449e182a5ad7e47e9f5c10
refs/heads/master: 8e16e33c168a6efd0c9f7fa9dd4c1e1db9a74553
6 changes: 6 additions & 0 deletions trunk/drivers/usb/serial/option.c
Original file line number Diff line number Diff line change
Expand Up @@ -554,6 +554,10 @@ static const struct option_blacklist_info net_intf1_blacklist = {
.reserved = BIT(1),
};

static const struct option_blacklist_info net_intf2_blacklist = {
.reserved = BIT(2),
};

static const struct option_blacklist_info net_intf3_blacklist = {
.reserved = BIT(3),
};
Expand Down Expand Up @@ -1099,6 +1103,8 @@ static const struct usb_device_id option_ids[] = {
{ USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x1298, 0xff, 0xff, 0xff) },
{ USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x1299, 0xff, 0xff, 0xff) },
{ USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x1300, 0xff, 0xff, 0xff) },
{ USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x1402, 0xff, 0xff, 0xff),
.driver_info = (kernel_ulong_t)&net_intf2_blacklist },
{ USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x2002, 0xff,
0xff, 0xff), .driver_info = (kernel_ulong_t)&zte_k3765_z_blacklist },
{ USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x2003, 0xff, 0xff, 0xff) },
Expand Down

0 comments on commit fe88de3

Please sign in to comment.