Merge branch 'wimax-2.6.35.y' of git://git.kernel.org/pub/scm/linux/kernel/git/inaky/wimax
This commit is contained in:
commit
76ac21f5ef
|
@ -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,
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -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
|
||||||
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) },
|
||||||
|
|
Loading…
Reference in New Issue