tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

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

David S. Miller 76ac21f5 ef3db4a5

+3
+1
drivers/net/wimax/i2400m/i2400m-usb.h
··· 152 152 /* Device IDs */ 153 153 USB_DEVICE_ID_I6050 = 0x0186, 154 154 USB_DEVICE_ID_I6050_2 = 0x0188, 155 + USB_DEVICE_ID_I6250 = 0x0187, 155 156 }; 156 157 157 158
+2
drivers/net/wimax/i2400m/usb.c
··· 491 491 switch (id->idProduct) { 492 492 case USB_DEVICE_ID_I6050: 493 493 case USB_DEVICE_ID_I6050_2: 494 + case USB_DEVICE_ID_I6250: 494 495 i2400mu->i6050 = 1; 495 496 break; 496 497 default: ··· 740 739 struct usb_device_id i2400mu_id_table[] = { 741 740 { USB_DEVICE(0x8086, USB_DEVICE_ID_I6050) }, 742 741 { USB_DEVICE(0x8086, USB_DEVICE_ID_I6050_2) }, 742 + { USB_DEVICE(0x8086, USB_DEVICE_ID_I6250) }, 743 743 { USB_DEVICE(0x8086, 0x0181) }, 744 744 { USB_DEVICE(0x8086, 0x1403) }, 745 745 { USB_DEVICE(0x8086, 0x1405) },