commit bee59680e1546f18bbfdbf156a72d355137a0f8a
author Linux Build Service Account <lnxbuild@localhost> Thu Apr 04 21:12:53 2013 -0700
committer Gerrit - the friendly Code Review server <code-review@localhost> Thu Apr 04 21:12:52 2013 -0700
tree 5db6053db118482d5f7ce10afad7902cc6fef4a0
parent e3b1041c58197399f697892dc5d6761b22442bd9
parent 785acd0e6e1877089262f6637b57fb2334b39127

Merge "defconfig: msm8974: Enable Chipidea USB2 gadget controller driver"

arch/arm/configs/msm8974-perf_defconfig

diff --git a/arch/arm/configs/msm8974-perf_defconfig b/arch/arm/configs/msm8974-perf_defconfig
index efca45a..f76f810 100644
--- a/arch/arm/configs/msm8974-perf_defconfig
+++ b/arch/arm/configs/msm8974-perf_defconfig
@@ -388,6 +388,7 @@
 CONFIG_USB_EHSET_TEST_FIXTURE=y
 CONFIG_USB_GADGET=y
 CONFIG_USB_GADGET_DEBUG_FILES=y
+CONFIG_USB_CI13XXX_MSM=y
 CONFIG_USB_DWC3_MSM=y
 CONFIG_USB_G_ANDROID=y
 CONFIG_MMC=y

arch/arm/configs/msm8974_defconfig

diff --git a/arch/arm/configs/msm8974_defconfig b/arch/arm/configs/msm8974_defconfig
index a226fe4..9e8c29a 100644
--- a/arch/arm/configs/msm8974_defconfig
+++ b/arch/arm/configs/msm8974_defconfig
@@ -396,6 +396,7 @@
 CONFIG_USB_EHSET_TEST_FIXTURE=y
 CONFIG_USB_GADGET=y
 CONFIG_USB_GADGET_DEBUG_FILES=y
+CONFIG_USB_CI13XXX_MSM=y
 CONFIG_USB_DWC3_MSM=y
 CONFIG_USB_G_ANDROID=y
 CONFIG_MMC=y