Skip to content

L
linux
Commit 76ac21f5 authored by David S. Miller's avatar David S. Miller
Browse files
Options

Merge branch 'wimax-2.6.35.y' of git://git.kernel.org/pub/scm/linux/kernel/git/inaky/wimax

parents ef3db4a5 41a8730c
Hide whitespace changes
Inline Side-by-side
Showing with 3 additions and 0 deletions
drivers/net/wimax/i2400m/i2400m-usb.h
View file @ 76ac21f5
...@@ -152,6 +152,7 @@ enum { ...@@ -152,6 +152,7 @@ enum {
/* Device IDs */ /* Device IDs */
USB_DEVICE_ID_I6050 = 0x0186, USB_DEVICE_ID_I6050 = 0x0186,
USB_DEVICE_ID_I6050_2 = 0x0188, USB_DEVICE_ID_I6050_2 = 0x0188,
USB_DEVICE_ID_I6250 = 0x0187,
}; };
......
drivers/net/wimax/i2400m/usb.c
View file @ 76ac21f5
...@@ -491,6 +491,7 @@ int i2400mu_probe(struct usb_interface *iface, ...@@ -491,6 +491,7 @@ int i2400mu_probe(struct usb_interface *iface,
switch (id->idProduct) { switch (id->idProduct) {
case USB_DEVICE_ID_I6050: case USB_DEVICE_ID_I6050:
case USB_DEVICE_ID_I6050_2: case USB_DEVICE_ID_I6050_2:
case USB_DEVICE_ID_I6250:
i2400mu->i6050 = 1; i2400mu->i6050 = 1;
break; break;
default: default:
...@@ -739,6 +740,7 @@ static ...@@ -739,6 +740,7 @@ static
struct usb_device_id i2400mu_id_table[] = { struct usb_device_id i2400mu_id_table[] = {
{ USB_DEVICE(0x8086, USB_DEVICE_ID_I6050) }, { USB_DEVICE(0x8086, USB_DEVICE_ID_I6050) },
{ USB_DEVICE(0x8086, USB_DEVICE_ID_I6050_2) }, { USB_DEVICE(0x8086, USB_DEVICE_ID_I6050_2) },
{ USB_DEVICE(0x8086, USB_DEVICE_ID_I6250) },
{ USB_DEVICE(0x8086, 0x0181) }, { USB_DEVICE(0x8086, 0x0181) },
{ USB_DEVICE(0x8086, 0x1403) }, { USB_DEVICE(0x8086, 0x1403) },
{ USB_DEVICE(0x8086, 0x1405) }, { USB_DEVICE(0x8086, 0x1405) },
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7