aboutsummaryrefslogtreecommitdiff
path: root/arch/arm
diff options
context:
space:
mode:
authorSebastien Jan <s-jan@ti.com>2011-10-25 10:51:56 +0800
committerAndy Green <andy.green@linaro.org>2011-11-19 08:53:42 +0800
commitaf4cfaaade038cb3d6bce56124baf42f8fd374d7 (patch)
tree6df4a342e83939a97147d75950617f85f37cc8de /arch/arm
parentc7b5f8850eccfe1caf092954fb21e2378a16783a (diff)
Config: enable musb in OTG mode
Signed-off-by: Sebastien Jan <s-jan@ti.com>
Diffstat (limited to 'arch/arm')
-rw-r--r--arch/arm/configs/omap4_defconfig4
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/configs/omap4_defconfig b/arch/arm/configs/omap4_defconfig
index fc378170bd7..04fe96a05db 100644
--- a/arch/arm/configs/omap4_defconfig
+++ b/arch/arm/configs/omap4_defconfig
@@ -246,8 +246,6 @@ CONFIG_USB=y
CONFIG_USB_ANNOUNCE_NEW_DEVICES=y
CONFIG_USB_DEVICEFS=y
CONFIG_USB_SUSPEND=y
-CONFIG_USB_OTG=y
-# CONFIG_USB_OTG_WHITELIST is not set
CONFIG_USB_MON=y
CONFIG_USB_EHCI_HCD=y
CONFIG_USB_EHCI_ROOT_HUB_TT=y
@@ -262,7 +260,9 @@ CONFIG_USB_GADGET_DEBUG_FILES=y
CONFIG_USB_GADGET_DEBUG_FS=y
CONFIG_USB_FUSB300=y
CONFIG_USB_ZERO=m
+CONFIG_USB_FILE_STORAGE=m
CONFIG_USB_MASS_STORAGE=m
+CONFIG_USB_G_MULTI=m
CONFIG_TWL4030_USB=y
CONFIG_TWL6030_USB=y
CONFIG_NOP_USB_XCEIV=y