diff options
| author | David S. Miller <davem@davemloft.net> | 2010-07-24 20:51:45 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-07-24 20:51:45 -0700 |
| commit | 76ac21f5ef30e46397e405695eb1240ff0955209 (patch) | |
| tree | e4a585f50efb0c37d9704510f2a9d601ff83c080 | |
| parent | ef3db4a5954281bc1ea49a4739c88eaea091dc71 (diff) | |
| parent | 41a8730c23aba4b77a13e5e151d2b69cd10ef6cb (diff) | |
| download | linux-3.10-76ac21f5ef30e46397e405695eb1240ff0955209.tar.gz linux-3.10-76ac21f5ef30e46397e405695eb1240ff0955209.tar.bz2 linux-3.10-76ac21f5ef30e46397e405695eb1240ff0955209.zip | |
Merge branch 'wimax-2.6.35.y' of git://git.kernel.org/pub/scm/linux/kernel/git/inaky/wimax
| -rw-r--r-- | drivers/net/wimax/i2400m/i2400m-usb.h | 1 | ||||
| -rw-r--r-- | drivers/net/wimax/i2400m/usb.c | 2 |
2 files changed, 3 insertions, 0 deletions
diff --git a/drivers/net/wimax/i2400m/i2400m-usb.h b/drivers/net/wimax/i2400m/i2400m-usb.h index 2d7c96d7e86..eb80243e22d 100644 --- a/drivers/net/wimax/i2400m/i2400m-usb.h +++ b/drivers/net/wimax/i2400m/i2400m-usb.h @@ -152,6 +152,7 @@ enum { /* Device IDs */ USB_DEVICE_ID_I6050 = 0x0186, USB_DEVICE_ID_I6050_2 = 0x0188, + USB_DEVICE_ID_I6250 = 0x0187, }; diff --git a/drivers/net/wimax/i2400m/usb.c b/drivers/net/wimax/i2400m/usb.c index 0d5081d77dc..d3365ac85dd 100644 --- a/drivers/net/wimax/i2400m/usb.c +++ b/drivers/net/wimax/i2400m/usb.c @@ -491,6 +491,7 @@ 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_I6250: i2400mu->i6050 = 1; break; default: @@ -739,6 +740,7 @@ 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(0x8086, USB_DEVICE_ID_I6250) }, { USB_DEVICE(0x8086, 0x0181) }, { USB_DEVICE(0x8086, 0x1403) }, { USB_DEVICE(0x8086, 0x1405) }, |