From 1863e77fcbb46dc384ebca5f4e12c949b4c84bba Mon Sep 17 00:00:00 2001 From: Randy Dunlap Date: Tue, 14 Sep 2010 15:39:50 -0700 Subject: [PATCH] --- yaml --- r: 219865 b: refs/heads/master c: 5fe1f1edb916aa4f573563449ceccd1b468aedda h: refs/heads/master i: 219863: 4272c892aaf1de3e49fdeec5451c112dfb22a2e8 v: v3 --- [refs] | 2 +- trunk/drivers/staging/bcm/InterfaceInit.c | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 4652be52510f..d38995c17d3e 100644 --- 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 index e06f168a52bd..d22a0e52a046 100644 --- 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 {