diff options
author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2014-12-19 09:37:54 -0500 |
---|---|---|
committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2014-12-19 16:55:06 -0500 |
commit | 464ed18ebdb6236fcff59d2a35d4d2e28668435a (patch) | |
tree | 4d0f84c41d849ef5cf2ff5fb6453d0fc558b0c02 /drivers/usb | |
parent | 71504e519d779261f03fb547c0439500b2e5fa9b (diff) |
PM: Eliminate CONFIG_PM_RUNTIME
Having switched over all of the users of CONFIG_PM_RUNTIME to use
CONFIG_PM directly, turn the latter into a user-selectable option
and drop the former entirely from the tree.
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Reviewed-by: Ulf Hansson <ulf.hansson@linaro.org>
Acked-by: Kevin Hilman <khilman@linaro.org>
Diffstat (limited to 'drivers/usb')
-rw-r--r-- | drivers/usb/host/isp1760-hcd.c | 2 | ||||
-rw-r--r-- | drivers/usb/host/oxu210hp-hcd.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/drivers/usb/host/isp1760-hcd.c b/drivers/usb/host/isp1760-hcd.c index e752c3098f38..395649f357aa 100644 --- a/drivers/usb/host/isp1760-hcd.c +++ b/drivers/usb/host/isp1760-hcd.c | |||
@@ -1739,7 +1739,7 @@ static int isp1760_hub_status_data(struct usb_hcd *hcd, char *buf) | |||
1739 | int retval = 1; | 1739 | int retval = 1; |
1740 | unsigned long flags; | 1740 | unsigned long flags; |
1741 | 1741 | ||
1742 | /* if !PM_RUNTIME, root hub timers won't get shut down ... */ | 1742 | /* if !PM, root hub timers won't get shut down ... */ |
1743 | if (!HC_IS_RUNNING(hcd->state)) | 1743 | if (!HC_IS_RUNNING(hcd->state)) |
1744 | return 0; | 1744 | return 0; |
1745 | 1745 | ||
diff --git a/drivers/usb/host/oxu210hp-hcd.c b/drivers/usb/host/oxu210hp-hcd.c index 75811dd5a9d7..036924e640f5 100644 --- a/drivers/usb/host/oxu210hp-hcd.c +++ b/drivers/usb/host/oxu210hp-hcd.c | |||
@@ -3087,7 +3087,7 @@ static int oxu_hub_status_data(struct usb_hcd *hcd, char *buf) | |||
3087 | int ports, i, retval = 1; | 3087 | int ports, i, retval = 1; |
3088 | unsigned long flags; | 3088 | unsigned long flags; |
3089 | 3089 | ||
3090 | /* if !PM_RUNTIME, root hub timers won't get shut down ... */ | 3090 | /* if !PM, root hub timers won't get shut down ... */ |
3091 | if (!HC_IS_RUNNING(hcd->state)) | 3091 | if (!HC_IS_RUNNING(hcd->state)) |
3092 | return 0; | 3092 | return 0; |
3093 | 3093 | ||