Commit 6d602610 authored by Anand Gadiyar's avatar Anand Gadiyar Committed by Greg Kroah-Hartman

USB: fix build on OMAPs if CONFIG_PM_RUNTIME is not set

With patch as1329 (USB: convert to the runtime PM framework),
we make USB_SUSPEND depend on PM_RUNTIME instead of CONFIG_PM.

Also, CONFIG_USB_OTG selects CONFIG_USB_SUSPEND.

If PM_RUNTIME is not enabled, and we try to enable USB_OTG,
we will end up with CONFIG_USB_SUSPEND selected. This is
due to a known bug with the select statement.

This makes the build break on various OMAP configs (which
have CONFIG_USB_OTG set by default, but do not yet have
CONFIG_PM_RUNTIME enabled).

Avoid this by changing the logic for CONFIG_USB_OTG from
"select USB_SUSPEND" to "depends on USB_SUSPEND"
Signed-off-by: default avatarAnand Gadiyar <gadiyar@ti.com>
CC: Michal Marek <mmarek@suse.cz>
CC: Tony Lindgren <tony@atomide.com>
CC: Alan Stern <stern@rowland.harvard.edu>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 82a5eeb9
...@@ -109,7 +109,7 @@ config USB_SUSPEND ...@@ -109,7 +109,7 @@ config USB_SUSPEND
config USB_OTG config USB_OTG
bool bool
depends on USB && EXPERIMENTAL depends on USB && EXPERIMENTAL
select USB_SUSPEND depends on USB_SUSPEND
default n default n
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment