diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2017-02-01 19:24:00 -0800 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2017-02-01 19:24:00 -0800 |
| commit | 7fba111f4f8c8191949c50eb7be2fa81ab1ebd98 (patch) | |
| tree | 379970026cb3f5eb3eee0400e8f12c70886efb8d /arch | |
| parent | 6f6896aa6458a8586b7c2e36eb9ea607901e5b3f (diff) | |
| parent | 45d15ab1e66f81ae237f6ec43ff6871f3cceafd3 (diff) | |
Merge "defconfig: msm8998: Enable USB CCID function driver"
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm64/configs/msmcortex-perf_defconfig | 1 | ||||
| -rw-r--r-- | arch/arm64/configs/msmcortex_defconfig | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm64/configs/msmcortex-perf_defconfig b/arch/arm64/configs/msmcortex-perf_defconfig index 38ffcd675704..0b043bb2134d 100644 --- a/arch/arm64/configs/msmcortex-perf_defconfig +++ b/arch/arm64/configs/msmcortex-perf_defconfig @@ -456,6 +456,7 @@ CONFIG_USB_CONFIGFS_F_DIAG=y CONFIG_USB_CONFIGFS_F_GSI=y CONFIG_USB_CONFIGFS_F_CDEV=y CONFIG_USB_CONFIGFS_F_QDSS=y +CONFIG_USB_CONFIGFS_F_CCID=y CONFIG_MMC=y CONFIG_MMC_PERF_PROFILING=y CONFIG_MMC_CLKGATE=y diff --git a/arch/arm64/configs/msmcortex_defconfig b/arch/arm64/configs/msmcortex_defconfig index cbff6b3a5b74..9971d9b38f56 100644 --- a/arch/arm64/configs/msmcortex_defconfig +++ b/arch/arm64/configs/msmcortex_defconfig @@ -457,6 +457,7 @@ CONFIG_USB_CONFIGFS_F_DIAG=y CONFIG_USB_CONFIGFS_F_GSI=y CONFIG_USB_CONFIGFS_F_CDEV=y CONFIG_USB_CONFIGFS_F_QDSS=y +CONFIG_USB_CONFIGFS_F_CCID=y CONFIG_MMC=y CONFIG_MMC_PERF_PROFILING=y CONFIG_MMC_PARANOID_SD_INIT=y |