diff options
author | Jerome Kurtz <jrm.kurtz@gmail.com> | 2012-09-19 15:21:41 +0000 |
---|---|---|
committer | Andrey Konovalov <andrey.konovalov@linaro.org> | 2012-10-09 22:25:16 +0400 |
commit | ef452e5860ca0c86bce865150a0a89d39d8ec63d (patch) | |
tree | 3b281dfe9d5551312015a452de92fe8a04a61380 | |
parent | 01629e6c4f9c26781c13ef5db6957413ca4bef28 (diff) |
usb: otg: Resolving a config conflict between omap4030_usb/omap6030 and usb_musb_omap2plustracking-llct-v3.6-misc-fixes-llct-20121012.0tracking-llct-v3.6-misc-fixes-llct-20121009.0tracking-llct-v3.6-misc-fixes-linux-linaro-core-3.6-20121220.0tracking-llct-v3.6-misc-fixes-linux-linaro-core-3.6-20121123.0tracking-llct-v3.6-misc-fixes-linux-linaro-core-3.6-20121107.0
When I try to compile with TWL6030_USB=y, TWL4030_USB=y and
USB_MUSB_OMAP2PLUS=m, I get the following error:
drivers/built-in.o: In function `twl4030_usb_irq':
/home/xxx/kernel/linux/drivers/usb/otg/twl4030-usb.c:518: undefined
reference to `omap_musb_mailbox'
drivers/built-in.o: In function `twl6030_usb_irq':
/home/xxx/kernel/linux/drivers/usb/otg/twl6030-usb.c:272: undefined
reference to `omap_musb_mailbox'
/home/xxx/kernel/linux/drivers/usb/otg/twl6030-usb.c:277: undefined
reference to `omap_musb_mailbox'
drivers/built-in.o: In function `twl6030_usbotg_irq':
/home/xxx/kernel/linux/drivers/usb/otg/twl6030-usb.c:306: undefined
reference to `omap_musb_mailbox'
drivers/built-in.o: In function `twl4030_usb_phy_init':
/home/xxx/kernel/linux/drivers/usb/otg/twl4030-usb.c:540: undefined
reference to `omap_musb_mailbox'
make: *** [vmlinux] Error 1
To solve this we must add to depends of TWL4030_USB and TWL6030_USB
the option : USB_MUSB_OMAP2PLUS as done here.
Signed-off-by: Jerome Kurtz <jrm.kurtz@gmail.com>
-rw-r--r-- | drivers/usb/otg/Kconfig | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/usb/otg/Kconfig b/drivers/usb/otg/Kconfig index 13fd1ddf742..62ea57b1b30 100644 --- a/drivers/usb/otg/Kconfig +++ b/drivers/usb/otg/Kconfig @@ -58,7 +58,7 @@ config USB_ULPI_VIEWPORT config TWL4030_USB tristate "TWL4030 USB Transceiver Driver" - depends on TWL4030_CORE && REGULATOR_TWL4030 + depends on TWL4030_CORE && REGULATOR_TWL4030 && USB_MUSB_OMAP2PLUS select USB_OTG_UTILS help Enable this to support the USB OTG transceiver on TWL4030 @@ -68,7 +68,7 @@ config TWL4030_USB config TWL6030_USB tristate "TWL6030 USB Transceiver Driver" - depends on TWL4030_CORE + depends on TWL4030_CORE && USB_MUSB_OMAP2PLUS select USB_OTG_UTILS help Enable this to support the USB OTG transceiver on TWL6030 |