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

diff --combined drivers/net/wimax/i2400m/usb.c
index 0d5081d77dc045f01849676a54d1b13e39ae0b72,0f88702bf5b8ef04f177fa50c9d608a61d406f2b..d3365ac85dde4639e455b35b65c805cdec1aa552
--- 1/drivers/net/wimax/i2400m/usb.c
--- 2/drivers/net/wimax/i2400m/usb.c
+++ b/drivers/net/wimax/i2400m/usb.c
@@@ -491,6 -491,7 +491,7 @@@ int i2400mu_probe(struct usb_interface 
        switch (id->idProduct) {
        case USB_DEVICE_ID_I6050:
        case USB_DEVICE_ID_I6050_2:
+       case USB_DEVICE_ID_I6250:
                i2400mu->i6050 = 1;
                break;
        default:
@@@ -514,7 -515,7 +515,7 @@@
        iface->needs_remote_wakeup = 1;         /* autosuspend (15s delay) */
        device_init_wakeup(dev, 1);
        usb_dev->autosuspend_delay = 15 * HZ;
 -      usb_dev->autosuspend_disabled = 0;
 +      usb_enable_autosuspend(usb_dev);
  #endif
  
        result = i2400m_setup(i2400m, I2400M_BRI_MAC_REINIT);
@@@ -739,6 -740,7 +740,7 @@@ stati
  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) },