diff options
author | Robert Marklund <robert.marklund@stericsson.com> | 2011-10-14 15:28:36 +0200 |
---|---|---|
committer | Philippe Langlais <philippe.langlais@linaro.org> | 2012-03-19 08:50:44 +0100 |
commit | f676eb0ab2a05e120cca72ab053a291b5dc76fba (patch) | |
tree | 0a7b099fc8f0a605666459741fe3950b917b0ed2 | |
parent | b396107a4d805dd85b19271d8e4572257de3ddc8 (diff) |
config: enable usb modules
Change-Id: I9cefa3c2089df1b0cc70e21f28a7550dae16e8fd
Signed-off-by: Robert Marklund <robert.marklund@stericsson.com>
Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/34109
Reviewed-by: Philippe LANGLAIS <philippe.langlais@stericsson.com>
-rwxr-xr-x | arch/arm/configs/u8500_defconfig | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/arch/arm/configs/u8500_defconfig b/arch/arm/configs/u8500_defconfig index 560ad8c7f9c..0eadd9445ec 100755 --- a/arch/arm/configs/u8500_defconfig +++ b/arch/arm/configs/u8500_defconfig @@ -95,10 +95,8 @@ CONFIG_BT_BNEP=y CONFIG_BT_BNEP_MC_FILTER=y CONFIG_BT_BNEP_PROTO_FILTER=y CONFIG_BT_HIDP=y -CONFIG_CFG80211=m CONFIG_NL80211_TESTMODE=y CONFIG_CFG80211_REG_DEBUG=y -CONFIG_CFG80211_WEXT=y CONFIG_RFKILL=y CONFIG_RFKILL_INPUT=y CONFIG_NET_9P=y @@ -215,6 +213,13 @@ CONFIG_USB_STORAGE=y CONFIG_USB_LIBUSUAL=y CONFIG_USB_GADGET=y CONFIG_USB_GADGET_VBUS_DRAW=500 +CONFIG_USB_ZERO=m +CONFIG_USB_ETH=m +CONFIG_USB_MASS_STORAGE=m +CONFIG_USB_G_SERIAL=m +CONFIG_USB_CDC_COMPOSITE=m +CONFIG_USB_G_MULTI=m +# CONFIG_USB_G_MULTI_RNDIS is not set CONFIG_AB8500_USB=y CONFIG_MMC=y CONFIG_MMC_UNSAFE_RESUME=y @@ -246,9 +251,7 @@ CONFIG_CG2900_AUDIO=y CONFIG_CG2900_TEST=y CONFIG_BT_CG2900=y CONFIG_CW1200=m -# CONFIG_CW1200_NON_POWER_OF_TWO_BLOCKSIZES is not set CONFIG_CW1200_USE_GPIO_IRQ=y -CONFIG_CW1200_WOW=y CONFIG_CW1200_DEBUGFS=y CONFIG_U8500_MMIO=y CONFIG_U8500_CM=y @@ -316,4 +319,3 @@ CONFIG_CRYPTO_TWOFISH=y CONFIG_CRYPTO_DEV_UX500=y CONFIG_CRC7=y CONFIG_LIBCRC32C=m -CONFIG_AVERAGE=y |