Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 347299
b: refs/heads/master
c: 999a7c5
h: refs/heads/master
i:
  347297: a832f7f
  347295: 84ebe67
v: v3
  • Loading branch information
Dan Williams authored and David S. Miller committed Dec 16, 2012
1 parent 3835955 commit 7d52cd3
Show file tree
Hide file tree
Showing 3 changed files with 10 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: 50077cd2dd33635f7b6896b7c518001f99c99ea1
refs/heads/master: 999a7c5776a0ed2133645fa7e008bec05bda9254
3 changes: 3 additions & 0 deletions trunk/drivers/net/wimax/i2400m/i2400m-usb.h
Original file line number Diff line number Diff line change
Expand Up @@ -152,6 +152,9 @@ enum {
/* Device IDs */
USB_DEVICE_ID_I6050 = 0x0186,
USB_DEVICE_ID_I6050_2 = 0x0188,
USB_DEVICE_ID_I6150 = 0x07d6,
USB_DEVICE_ID_I6150_2 = 0x07d7,
USB_DEVICE_ID_I6150_3 = 0x07d9,
USB_DEVICE_ID_I6250 = 0x0187,
};

Expand Down
6 changes: 6 additions & 0 deletions trunk/drivers/net/wimax/i2400m/usb.c
Original file line number Diff line number Diff line change
Expand Up @@ -510,6 +510,9 @@ int i2400mu_probe(struct usb_interface *iface,
switch (id->idProduct) {
case USB_DEVICE_ID_I6050:
case USB_DEVICE_ID_I6050_2:
case USB_DEVICE_ID_I6150:
case USB_DEVICE_ID_I6150_2:
case USB_DEVICE_ID_I6150_3:
case USB_DEVICE_ID_I6250:
i2400mu->i6050 = 1;
break;
Expand Down Expand Up @@ -759,6 +762,9 @@ static
struct usb_device_id i2400mu_id_table[] = {
{ USB_DEVICE(0x8086, USB_DEVICE_ID_I6050) },
{ USB_DEVICE(0x8086, USB_DEVICE_ID_I6050_2) },
{ USB_DEVICE(0x8087, USB_DEVICE_ID_I6150) },
{ USB_DEVICE(0x8087, USB_DEVICE_ID_I6150_2) },
{ USB_DEVICE(0x8087, USB_DEVICE_ID_I6150_3) },
{ USB_DEVICE(0x8086, USB_DEVICE_ID_I6250) },
{ USB_DEVICE(0x8086, 0x0181) },
{ USB_DEVICE(0x8086, 0x1403) },
Expand Down

0 comments on commit 7d52cd3

Please sign in to comment.