commit b4c870b64d2f17d9c5a19825e3c236807eaf999d
author Linux Build Service Account <lnxbuild@localhost> Wed Jan 08 09:54:23 2014 -0800
committer Gerrit - the friendly Code Review server <code-review@localhost> Wed Jan 08 09:54:23 2014 -0800
tree 539c82de8119eb9b949275d71f985256f3830376
parent d7e5ef8a19a330d579a6878476d5209d617ed890
parent 1ad521118ccf31830488bb139763728b0f2e5f1d

Merge "defconfig: 8226: Enable USB CCID class driver"

arch/arm/configs/msm8226-perf_defconfig

diff --git a/arch/arm/configs/msm8226-perf_defconfig b/arch/arm/configs/msm8226-perf_defconfig
index 6b1f88d..6c3898c 100644
--- a/arch/arm/configs/msm8226-perf_defconfig
+++ b/arch/arm/configs/msm8226-perf_defconfig
@@ -359,6 +359,7 @@
 CONFIG_USB_EHCI_MSM=y
 CONFIG_USB_EHCI_MSM_HSIC=y
 CONFIG_USB_ACM=y
+CONFIG_USB_CCID_BRIDGE=y
 CONFIG_USB_STORAGE=y
 CONFIG_USB_STORAGE_DATAFAB=y
 CONFIG_USB_STORAGE_FREECOM=y

arch/arm/configs/msm8226_defconfig

diff --git a/arch/arm/configs/msm8226_defconfig b/arch/arm/configs/msm8226_defconfig
index 2d54549..e14118d 100644
--- a/arch/arm/configs/msm8226_defconfig
+++ b/arch/arm/configs/msm8226_defconfig
@@ -383,6 +383,7 @@
 CONFIG_USB_EHCI_MSM=y
 CONFIG_USB_EHCI_MSM_HSIC=y
 CONFIG_USB_ACM=y
+CONFIG_USB_CCID_BRIDGE=y
 CONFIG_USB_STORAGE=y
 CONFIG_USB_STORAGE_DATAFAB=y
 CONFIG_USB_STORAGE_FREECOM=y