commit 15fc14cbd9316b0e71cd222cae122f429eb1d55d
author Linux Build Service Account <lnxbuild@localhost> Tue Jul 23 07:00:49 2019 -0700
committer Gerrit - the friendly Code Review server <code-review@localhost> Tue Jul 23 07:00:49 2019 -0700
tree e04a3e67849e88f70545121c43e5c16875076210
parent 15d7aefbf87faef7d1af4fb73ad7736c600892f0
parent 01e8422e19ee8d65fdcf2ad7c66054c54f2487b3

Merge "defconfig: msm: Enable USB ACM for sdm845"

arch/arm64/configs/sdm845-perf_defconfig

diff --git a/arch/arm64/configs/sdm845-perf_defconfig b/arch/arm64/configs/sdm845-perf_defconfig
index 9e0c7a8..4529bfb 100755
--- a/arch/arm64/configs/sdm845-perf_defconfig
+++ b/arch/arm64/configs/sdm845-perf_defconfig
@@ -419,6 +419,7 @@
 CONFIG_USB_EHCI_HCD_PLATFORM=y
 CONFIG_USB_OHCI_HCD=y
 CONFIG_USB_OHCI_HCD_PLATFORM=y
+CONFIG_USB_ACM=y
 CONFIG_USB_STORAGE=y
 CONFIG_USB_DWC3=y
 CONFIG_USB_DWC3_MSM=y

arch/arm64/configs/sdm845_defconfig

diff --git a/arch/arm64/configs/sdm845_defconfig b/arch/arm64/configs/sdm845_defconfig
index 99b464a..c063564 100755
--- a/arch/arm64/configs/sdm845_defconfig
+++ b/arch/arm64/configs/sdm845_defconfig
@@ -423,6 +423,7 @@
 CONFIG_USB_EHCI_HCD_PLATFORM=y
 CONFIG_USB_OHCI_HCD=y
 CONFIG_USB_OHCI_HCD_PLATFORM=y
+CONFIG_USB_ACM=y
 CONFIG_USB_STORAGE=y
 CONFIG_USB_DWC3=y
 CONFIG_USB_DWC3_MSM=y