Commit 028b271b authored by David Brownell's avatar David Brownell Committed by Greg Kroah-Hartman

[PATCH] USB: Kconfig fixes for usb/gadget

This prevents gadget drivers from being selected when no controller has
been selected, by adding an additional boolean and depending on it.
It's mostly to help "allmodconfig".
Signed-off-by: default avatarDavid Brownell <dbrownell@users.sourceforge.net>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 4244f724
...@@ -53,6 +53,9 @@ config USB_GADGET_DEBUG_FILES ...@@ -53,6 +53,9 @@ config USB_GADGET_DEBUG_FILES
driver on a new board. Enable these files by choosing "Y" driver on a new board. Enable these files by choosing "Y"
here. If in doubt, or to conserve kernel memory, say "N". here. If in doubt, or to conserve kernel memory, say "N".
config USB_GADGET_SELECTED
boolean
# #
# USB Peripheral Controller Support # USB Peripheral Controller Support
# #
...@@ -85,6 +88,7 @@ config USB_NET2280 ...@@ -85,6 +88,7 @@ config USB_NET2280
tristate tristate
depends on USB_GADGET_NET2280 depends on USB_GADGET_NET2280
default USB_GADGET default USB_GADGET
select USB_GADGET_SELECTED
config USB_GADGET_PXA2XX config USB_GADGET_PXA2XX
boolean "PXA 25x or IXP 4xx" boolean "PXA 25x or IXP 4xx"
...@@ -105,6 +109,7 @@ config USB_PXA2XX ...@@ -105,6 +109,7 @@ config USB_PXA2XX
tristate tristate
depends on USB_GADGET_PXA2XX depends on USB_GADGET_PXA2XX
default USB_GADGET default USB_GADGET
select USB_GADGET_SELECTED
# if there's only one gadget driver, using only two bulk endpoints, # if there's only one gadget driver, using only two bulk endpoints,
# don't waste memory for the other endpoints # don't waste memory for the other endpoints
...@@ -134,6 +139,7 @@ config USB_GOKU ...@@ -134,6 +139,7 @@ config USB_GOKU
tristate tristate
depends on USB_GADGET_GOKU depends on USB_GADGET_GOKU
default USB_GADGET default USB_GADGET
select USB_GADGET_SELECTED
config USB_GADGET_LH7A40X config USB_GADGET_LH7A40X
...@@ -146,6 +152,7 @@ config USB_LH7A40X ...@@ -146,6 +152,7 @@ config USB_LH7A40X
tristate tristate
depends on USB_GADGET_LH7A40X depends on USB_GADGET_LH7A40X
default USB_GADGET default USB_GADGET
select USB_GADGET_SELECTED
config USB_GADGET_OMAP config USB_GADGET_OMAP
...@@ -167,6 +174,7 @@ config USB_OMAP ...@@ -167,6 +174,7 @@ config USB_OMAP
tristate tristate
depends on USB_GADGET_OMAP depends on USB_GADGET_OMAP
default USB_GADGET default USB_GADGET
select USB_GADGET_SELECTED
config USB_OTG config USB_OTG
boolean "OTG Support" boolean "OTG Support"
...@@ -207,6 +215,7 @@ config USB_DUMMY_HCD ...@@ -207,6 +215,7 @@ config USB_DUMMY_HCD
tristate tristate
depends on USB_GADGET_DUMMY_HCD depends on USB_GADGET_DUMMY_HCD
default USB_GADGET default USB_GADGET
select USB_GADGET_SELECTED
# NOTE: Please keep dummy_hcd LAST so that "real hardware" appears # NOTE: Please keep dummy_hcd LAST so that "real hardware" appears
# first and will be selected by default. # first and will be selected by default.
...@@ -226,7 +235,7 @@ config USB_GADGET_DUALSPEED ...@@ -226,7 +235,7 @@ config USB_GADGET_DUALSPEED
# #
choice choice
tristate "USB Gadget Drivers" tristate "USB Gadget Drivers"
depends on USB_GADGET depends on USB_GADGET && USB_GADGET_SELECTED
default USB_ETH default USB_ETH
help help
A Linux "Gadget Driver" talks to the USB Peripheral Controller A Linux "Gadget Driver" talks to the USB Peripheral Controller
......
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