diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2016-12-09 19:59:10 -0800 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2016-12-09 19:59:10 -0800 |
| commit | 7483dccc26f90c25136ab31e6dbe5bb1c781e14b (patch) | |
| tree | bab1d2b14d5c4548bdfb9b8df8f2999de9946b84 | |
| parent | d18f96a5e19fba93bb0c80b51b235e0b51534741 (diff) | |
| parent | d7c3ca1390eee2c293a24e1bf4be2f13be9d0105 (diff) | |
Merge "defconfig: Add missing features for HW Encryption support"
| -rw-r--r-- | arch/arm/configs/msmfalcon-perf_defconfig | 2 | ||||
| -rw-r--r-- | arch/arm/configs/msmfalcon_defconfig | 1 |
2 files changed, 3 insertions, 0 deletions
diff --git a/arch/arm/configs/msmfalcon-perf_defconfig b/arch/arm/configs/msmfalcon-perf_defconfig index 86a9ac168d0e..82854b1a4a06 100644 --- a/arch/arm/configs/msmfalcon-perf_defconfig +++ b/arch/arm/configs/msmfalcon-perf_defconfig @@ -249,6 +249,7 @@ CONFIG_SCSI_SCAN_ASYNC=y CONFIG_SCSI_UFSHCD=y CONFIG_SCSI_UFSHCD_PLATFORM=y CONFIG_SCSI_UFS_QCOM=y +CONFIG_SCSI_UFS_QCOM_ICE=y CONFIG_MD=y CONFIG_BLK_DEV_DM=y CONFIG_DM_CRYPT=y @@ -548,6 +549,7 @@ CONFIG_EXT3_FS=y CONFIG_EXT4_FS_SECURITY=y CONFIG_EXT4_ENCRYPTION=y CONFIG_EXT4_FS_ENCRYPTION=y +CONFIG_EXT4_FS_ICE_ENCRYPTION=y CONFIG_EXT4_DEBUG=y CONFIG_FUSE_FS=y CONFIG_MSDOS_FS=y diff --git a/arch/arm/configs/msmfalcon_defconfig b/arch/arm/configs/msmfalcon_defconfig index cb1644d85ac6..aebbd21f7d42 100644 --- a/arch/arm/configs/msmfalcon_defconfig +++ b/arch/arm/configs/msmfalcon_defconfig @@ -248,6 +248,7 @@ CONFIG_SCSI_SCAN_ASYNC=y CONFIG_SCSI_UFSHCD=y CONFIG_SCSI_UFSHCD_PLATFORM=y CONFIG_SCSI_UFS_QCOM=y +CONFIG_SCSI_UFS_QCOM_ICE=y CONFIG_MD=y CONFIG_BLK_DEV_DM=y CONFIG_DM_CRYPT=y |