diff options
author | Arnd Bergmann <arnd@arndb.de> | 2016-03-23 12:45:08 -0400 |
---|---|---|
committer | Felipe Balbi <felipe.balbi@linux.intel.com> | 2016-04-18 08:23:36 -0400 |
commit | badf6d47f8a93098c6e05fdeb735b44b61877451 (patch) | |
tree | 91f57a9087083445df4e219c5a9aff4fcced5ad7 /drivers/usb/Kconfig | |
parent | dea520a4a28307034b1842adbfde947e1ed385d2 (diff) |
usb: common: rework CONFIG_USB_COMMON logic
The phy-am335x driver selects 'USB_COMMON', but all other drivers
use 'depends on' for that symbol, and it depends on USB || USB_GADGET
itself, which causes a Kconfig warning:
warning: (AM335X_PHY_USB) selects USB_COMMON which has unmet direct dependencies (USB_SUPPORT && (USB || USB_GADGET))
As suggested by Felipe Balbi, this turns the logic around, and makes
'USB_COMMON' selected by everything else that needs it, so we can
remove the dependencies.
Fixes: 59f042f644c5 ("usb: phy: phy-am335x: bypass first VBUS sensing for host-only mode")
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Acked-by: Felipe Balbi <balbi@kernel.org>
Reviewed-by: Peter Chen <peter.chen@nxp.com>
Signed-off-by: Felipe Balbi <felipe.balbi@linux.intel.com>
Diffstat (limited to 'drivers/usb/Kconfig')
-rw-r--r-- | drivers/usb/Kconfig | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/usb/Kconfig b/drivers/usb/Kconfig index 8ed451dd651e..8689dcba5201 100644 --- a/drivers/usb/Kconfig +++ b/drivers/usb/Kconfig | |||
@@ -31,8 +31,6 @@ if USB_SUPPORT | |||
31 | 31 | ||
32 | config USB_COMMON | 32 | config USB_COMMON |
33 | tristate | 33 | tristate |
34 | default y | ||
35 | depends on USB || USB_GADGET | ||
36 | 34 | ||
37 | config USB_ARCH_HAS_HCD | 35 | config USB_ARCH_HAS_HCD |
38 | def_bool y | 36 | def_bool y |
@@ -41,6 +39,7 @@ config USB_ARCH_HAS_HCD | |||
41 | config USB | 39 | config USB |
42 | tristate "Support for Host-side USB" | 40 | tristate "Support for Host-side USB" |
43 | depends on USB_ARCH_HAS_HCD | 41 | depends on USB_ARCH_HAS_HCD |
42 | select USB_COMMON | ||
44 | select NLS # for UTF-8 strings | 43 | select NLS # for UTF-8 strings |
45 | ---help--- | 44 | ---help--- |
46 | Universal Serial Bus (USB) is a specification for a serial bus | 45 | Universal Serial Bus (USB) is a specification for a serial bus |