summaryrefslogtreecommitdiffstats
path: root/drivers/usb
diff options
context:
space:
mode:
authorAnand Gadiyar <gadiyar@ti.com>2010-03-29 16:54:51 +0530
committerGreg Kroah-Hartman <gregkh@suse.de>2010-04-30 09:25:11 -0700
commit6d602610099632a9a15ef6d2bc9fd7b7d6aeb63e (patch)
tree2b1bf2f40451d24160556cad7d161c87b3930d80 /drivers/usb
parent82a5eeb9f486366ad1b6c3be2e0d328ca185aa7e (diff)
downloadop-kernel-dev-6d602610099632a9a15ef6d2bc9fd7b7d6aeb63e.zip
op-kernel-dev-6d602610099632a9a15ef6d2bc9fd7b7d6aeb63e.tar.gz
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: Anand 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: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/usb')
-rw-r--r--drivers/usb/core/Kconfig2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/usb/core/Kconfig b/drivers/usb/core/Kconfig
index 97a819c..7e594449 100644
--- a/drivers/usb/core/Kconfig
+++ b/drivers/usb/core/Kconfig
@@ -109,7 +109,7 @@ config USB_SUSPEND
config USB_OTG
bool
depends on USB && EXPERIMENTAL
- select USB_SUSPEND
+ depends on USB_SUSPEND
default n
OpenPOWER on IntegriCloud