summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSylwester Nawrocki <s.nawrocki@samsung.com>2016-09-07 07:50:26 -0700
committerGerrit Code Review <gerrit@review.vlan103.tizen.org>2016-09-07 07:50:26 -0700
commit54c938cd86acf725c576216177d2145439cc9051 (patch)
tree2025b1fe8e95f63d6b98ebf74c9bfeef54f08b11
parent42ebfb3d5471d17a43e9d653ae37eb58961ded24 (diff)
parentc626548989ff8c22cb7020397558a9d903d87a55 (diff)
downloadlinux-exynos-54c938cd86acf725c576216177d2145439cc9051.tar.gz
linux-exynos-54c938cd86acf725c576216177d2145439cc9051.tar.bz2
linux-exynos-54c938cd86acf725c576216177d2145439cc9051.zip
Merge "Enable dummy_hcd and FunctionFS in tm2 config." into tizen
-rw-r--r--arch/arm64/configs/tizen_tm2_defconfig6
1 files changed, 4 insertions, 2 deletions
diff --git a/arch/arm64/configs/tizen_tm2_defconfig b/arch/arm64/configs/tizen_tm2_defconfig
index dedc842212b0..d0c165debd37 100644
--- a/arch/arm64/configs/tizen_tm2_defconfig
+++ b/arch/arm64/configs/tizen_tm2_defconfig
@@ -3320,7 +3320,7 @@ CONFIG_USB_GADGET_STORAGE_NUM_BUFFERS=2
# CONFIG_USB_GOKU is not set
# CONFIG_USB_EG20T is not set
# CONFIG_USB_GADGET_XILINX is not set
-# CONFIG_USB_DUMMY_HCD is not set
+CONFIG_USB_DUMMY_HCD=m
CONFIG_USB_LIBCOMPOSITE=y
CONFIG_USB_F_ACM=y
CONFIG_USB_G_SLP_REQ_F_ACM=y
@@ -3328,6 +3328,8 @@ CONFIG_USB_F_ACM_SELECTOR=y
CONFIG_USB_U_SERIAL=y
CONFIG_USB_F_ACM_REQ_U_SERIAL=y
CONFIG_USB_U_SERIAL_SELECTOR=y
+CONFIG_USB_F_FS=m
+CONFIG_USB_F_FS_SELECTOR=m
#
# USB Functions
@@ -3342,7 +3344,7 @@ CONFIG_USB_U_SERIAL_SELECTOR=y
# CONFIG_USB_CONFIGFS_F_EEM is not set
# CONFIG_USB_CONFIGFS_F_MASS_STORAGE is not set
# CONFIG_USB_CONFIGFS_F_SS_LB is not set
-# CONFIG_USB_CONFIGFS_F_FS is not set
+CONFIG_USB_CONFIGFS_F_FS=m
# CONFIG_USB_CONFIGFS_F_UAC1 is not set
# CONFIG_USB_CONFIGFS_F_UAC2 is not set
# CONFIG_USB_CONFIGFS_F_MIDI is not set