Merge branch 'master' into upstream

1 files changed, 1 insertions, 1 deletions

diff --git a/include/linux/usb.h b/include/linux/usb.h
index 0da15b0b02be..190cc1b78fe2 100644
--- a/include/linux/usb.h
+++ b/include/linux/usb.h
@@ -380,10 +380,10 @@ struct usb_device {
         int maxchild;                   /* Number of ports if hub */
         struct usb_device *children[USB_MAXCHILDREN];
 
+        int pm_usage_cnt;               /* usage counter for autosuspend */
 #ifdef CONFIG_PM
         struct work_struct autosuspend; /* for delayed autosuspends */
         struct mutex pm_mutex;          /* protects PM operations */
-        int pm_usage_cnt;               /* usage counter for autosuspend */
 
         unsigned auto_pm:1;             /* autosuspend/resume in progress */
         unsigned do_remote_wakeup:1;    /* remote wakeup should be enabled */