Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

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

parents ef3db4a5 41a8730c

drivers/net/wimax/i2400m/i2400m-usb.h

+1 −0
Original line number Diff line number Diff line
@@ -152,6 +152,7 @@ enum { 
	/* Device IDs */

	USB_DEVICE_ID_I6050 = 0x0186,

	USB_DEVICE_ID_I6050_2 = 0x0188,

	USB_DEVICE_ID_I6250 = 0x0187,

};

drivers/net/wimax/i2400m/usb.c

+2 −0
Original line number Diff line number Diff line
@@ -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) },