Merge branch 'upstream' into bugfix-video

[karo-tx-linux.git] / drivers / net / usb / zaurus.c

diff --git a/drivers/net/usb/zaurus.c b/drivers/net/usb/zaurus.c
index 34db195fb8b00880bbc6f42d9d1837bbce67c601..35c90307d473009250aa7e711d8e4949db891607 100644 (file)
--- a/drivers/net/usb/zaurus.c
+++ b/drivers/net/usb/zaurus.c
@@ -377,6 +377,7 @@ static struct usb_driver zaurus_driver = {
        .disconnect =   usbnet_disconnect,
        .suspend =      usbnet_suspend,
        .resume =       usbnet_resume,
+       .disable_hub_initiated_lpm = 1,
 };
 
 module_usb_driver(zaurus_driver);