aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--arch/arm/mach-omap2/Makefile6
-rw-r--r--drivers/usb/musb/Kconfig1
2 files changed, 5 insertions, 2 deletions
diff --git a/arch/arm/mach-omap2/Makefile b/arch/arm/mach-omap2/Makefile
index 60e51bcf53bd..194863680fe0 100644
--- a/arch/arm/mach-omap2/Makefile
+++ b/arch/arm/mach-omap2/Makefile
@@ -168,9 +168,11 @@ obj-$(CONFIG_MACH_IGEP0030) += board-igep0030.o \
168obj-$(CONFIG_MACH_OMAP3_TOUCHBOOK) += board-omap3touchbook.o \ 168obj-$(CONFIG_MACH_OMAP3_TOUCHBOOK) += board-omap3touchbook.o \
169 hsmmc.o 169 hsmmc.o
170obj-$(CONFIG_MACH_OMAP_4430SDP) += board-4430sdp.o \ 170obj-$(CONFIG_MACH_OMAP_4430SDP) += board-4430sdp.o \
171 hsmmc.o 171 hsmmc.o \
172 omap_phy_internal.o
172obj-$(CONFIG_MACH_OMAP4_PANDA) += board-omap4panda.o \ 173obj-$(CONFIG_MACH_OMAP4_PANDA) += board-omap4panda.o \
173 hsmmc.o 174 hsmmc.o \
175 omap_phy_internal.o
174 176
175obj-$(CONFIG_MACH_OMAP3517EVM) += board-am3517evm.o 177obj-$(CONFIG_MACH_OMAP3517EVM) += board-am3517evm.o
176 178
diff --git a/drivers/usb/musb/Kconfig b/drivers/usb/musb/Kconfig
index 19145f6166fe..4cbb7e4b368d 100644
--- a/drivers/usb/musb/Kconfig
+++ b/drivers/usb/musb/Kconfig
@@ -12,6 +12,7 @@ config USB_MUSB_HDRC
12 depends on (ARM || (BF54x && !BF544) || (BF52x && !BF522 && !BF523)) 12 depends on (ARM || (BF54x && !BF544) || (BF52x && !BF522 && !BF523))
13 select NOP_USB_XCEIV if (ARCH_DAVINCI || MACH_OMAP3EVM || BLACKFIN) 13 select NOP_USB_XCEIV if (ARCH_DAVINCI || MACH_OMAP3EVM || BLACKFIN)
14 select TWL4030_USB if MACH_OMAP_3430SDP 14 select TWL4030_USB if MACH_OMAP_3430SDP
15 select TWL6030_USB if MACH_OMAP_4430SDP || MACH_OMAP4_PANDA
15 select USB_OTG_UTILS 16 select USB_OTG_UTILS
16 tristate 'Inventra Highspeed Dual Role Controller (TI, ADI, ...)' 17 tristate 'Inventra Highspeed Dual Role Controller (TI, ADI, ...)'
17 help 18 help