---

yaml --- r: 219865 b: refs/heads/master c: 5fe1f1e h: refs/heads/master i: 219863: 4272c89 v: v3
git-mirror · Sep 16, 2010 · 1863e77 · 1863e77
1 parent c9b9c88
commit 1863e77
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3e8acee461f3bdcec0a0a5cbf2886710a21a6662
+refs/heads/master: 5fe1f1edb916aa4f573563449ceccd1b468aedda
diff --git a/trunk/drivers/staging/bcm/InterfaceInit.c b/trunk/drivers/staging/bcm/InterfaceInit.c
@@ -277,6 +277,7 @@ usbbcm_device_probe(struct usb_interface *intf, const struct usb_device_id *id)
 		/* If Suspend then only support dynamic suspend */
 		if(psAdapter->bDoSuspend)
 		{
+#ifdef CONFIG_PM
 			udev->autosuspend_delay = 0;
 			intf->needs_remote_wakeup = 1;
 #if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 35)
@@ -290,6 +291,7 @@ usbbcm_device_probe(struct usb_interface *intf, const struct usb_device_id *id)
 #endif
 			INIT_WORK(&psIntfAdapter->usbSuspendWork, putUsbSuspend);
 			BCM_DEBUG_PRINT(psAdapter,DBG_TYPE_INITEXIT, DRV_ENTRY, DBG_LVL_ALL, "Enabling USB Auto-Suspend\n");
+#endif
 		}
 		else
 		{