diff options
author | Peter Ujfalusi <peter.ujfalusi@ti.com> | 2013-01-31 07:30:40 -0500 |
---|---|---|
committer | Felipe Balbi <balbi@ti.com> | 2013-03-04 02:33:30 -0500 |
commit | a10840c9acbeca7aada3543823fdb59909342d96 (patch) | |
tree | 50b01167f923ec1ad1aada533ed38f4261e7d98e /drivers | |
parent | 4ea34de7615c1208a08bce3ff75c234cca03c654 (diff) |
usb: musb: correct Kconfig in order to avoid non compilable selection
Currently it is possible to have:
USB_MUSB_OMAP2PLUS=m
TWL4030_USB=y
which would result compile time error due to missing symbols.
With this change USB_MUSB_OMAP2PLUS and TWL4030_USB will be in sync.
Reported-by: Vincent Stehle <v-stehle@ti.com>
Signed-off-by: Peter Ujfalusi <peter.ujfalusi@ti.com>
Signed-off-by: Felipe Balbi <balbi@ti.com>
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/usb/musb/Kconfig | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/usb/musb/Kconfig b/drivers/usb/musb/Kconfig index 45b19e2c60ba..2f7d84af6650 100644 --- a/drivers/usb/musb/Kconfig +++ b/drivers/usb/musb/Kconfig | |||
@@ -9,8 +9,6 @@ config USB_MUSB_HDRC | |||
9 | depends on USB && USB_GADGET | 9 | depends on USB && USB_GADGET |
10 | select NOP_USB_XCEIV if (ARCH_DAVINCI || MACH_OMAP3EVM || BLACKFIN) | 10 | select NOP_USB_XCEIV if (ARCH_DAVINCI || MACH_OMAP3EVM || BLACKFIN) |
11 | select NOP_USB_XCEIV if (SOC_TI81XX || SOC_AM33XX) | 11 | select NOP_USB_XCEIV if (SOC_TI81XX || SOC_AM33XX) |
12 | select TWL4030_USB if MACH_OMAP_3430SDP | ||
13 | select TWL6030_USB if MACH_OMAP_4430SDP || MACH_OMAP4_PANDA | ||
14 | select OMAP_CONTROL_USB if MACH_OMAP_4430SDP || MACH_OMAP4_PANDA | 12 | select OMAP_CONTROL_USB if MACH_OMAP_4430SDP || MACH_OMAP4_PANDA |
15 | select USB_OTG_UTILS | 13 | select USB_OTG_UTILS |
16 | help | 14 | help |
@@ -51,6 +49,8 @@ config USB_MUSB_TUSB6010 | |||
51 | config USB_MUSB_OMAP2PLUS | 49 | config USB_MUSB_OMAP2PLUS |
52 | tristate "OMAP2430 and onwards" | 50 | tristate "OMAP2430 and onwards" |
53 | depends on ARCH_OMAP2PLUS | 51 | depends on ARCH_OMAP2PLUS |
52 | select TWL4030_USB if MACH_OMAP_3430SDP | ||
53 | select TWL6030_USB if MACH_OMAP_4430SDP || MACH_OMAP4_PANDA | ||
54 | 54 | ||
55 | config USB_MUSB_AM35X | 55 | config USB_MUSB_AM35X |
56 | tristate "AM35x" | 56 | tristate "AM35x" |