diff options
| author | Linux Build Service Account <lnxbuild@quicinc.com> | 2017-11-05 22:33:08 -0800 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2017-11-05 22:33:08 -0800 |
| commit | 22cfc3487c0ed3a8bfd98a943f4b693314cf643c (patch) | |
| tree | f49668a360035987639a7e4bfa5fcafa5ca2a480 /arch | |
| parent | a1b1b96ce323d9030ceeae624d985b8494960b17 (diff) | |
| parent | 4f633c283f59ee89d8db45a5f918a6843978cd8f (diff) | |
Merge "defconfig: sdm660: Enable sdcardfs"
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/configs/sdm660-perf_defconfig | 1 | ||||
| -rw-r--r-- | arch/arm/configs/sdm660_defconfig | 1 | ||||
| -rw-r--r-- | arch/arm64/configs/sdm660-perf_defconfig | 1 | ||||
| -rw-r--r-- | arch/arm64/configs/sdm660_defconfig | 1 |
4 files changed, 4 insertions, 0 deletions
diff --git a/arch/arm/configs/sdm660-perf_defconfig b/arch/arm/configs/sdm660-perf_defconfig index c018f8fe24bb..32686982997d 100644 --- a/arch/arm/configs/sdm660-perf_defconfig +++ b/arch/arm/configs/sdm660-perf_defconfig @@ -628,6 +628,7 @@ CONFIG_TMPFS=y CONFIG_TMPFS_POSIX_ACL=y CONFIG_ECRYPT_FS=y CONFIG_ECRYPT_FS_MESSAGING=y +CONFIG_SDCARD_FS=y # CONFIG_NETWORK_FILESYSTEMS is not set CONFIG_NLS_CODEPAGE_437=y CONFIG_NLS_ISO8859_1=y diff --git a/arch/arm/configs/sdm660_defconfig b/arch/arm/configs/sdm660_defconfig index af5adfeb1a41..e1e4cfe88d94 100644 --- a/arch/arm/configs/sdm660_defconfig +++ b/arch/arm/configs/sdm660_defconfig @@ -628,6 +628,7 @@ CONFIG_TMPFS=y CONFIG_TMPFS_POSIX_ACL=y CONFIG_ECRYPT_FS=y CONFIG_ECRYPT_FS_MESSAGING=y +CONFIG_SDCARD_FS=y # CONFIG_NETWORK_FILESYSTEMS is not set CONFIG_NLS_CODEPAGE_437=y CONFIG_NLS_ISO8859_1=y diff --git a/arch/arm64/configs/sdm660-perf_defconfig b/arch/arm64/configs/sdm660-perf_defconfig index b40705dd7063..dff3cc7ce071 100644 --- a/arch/arm64/configs/sdm660-perf_defconfig +++ b/arch/arm64/configs/sdm660-perf_defconfig @@ -630,6 +630,7 @@ CONFIG_TMPFS=y CONFIG_TMPFS_POSIX_ACL=y CONFIG_ECRYPT_FS=y CONFIG_ECRYPT_FS_MESSAGING=y +CONFIG_SDCARD_FS=y CONFIG_NLS_CODEPAGE_437=y CONFIG_NLS_ISO8859_1=y CONFIG_PRINTK_TIME=y diff --git a/arch/arm64/configs/sdm660_defconfig b/arch/arm64/configs/sdm660_defconfig index 7819916fb841..2f96c5a677d9 100644 --- a/arch/arm64/configs/sdm660_defconfig +++ b/arch/arm64/configs/sdm660_defconfig @@ -650,6 +650,7 @@ CONFIG_TMPFS_POSIX_ACL=y CONFIG_EFIVAR_FS=y CONFIG_ECRYPT_FS=y CONFIG_ECRYPT_FS_MESSAGING=y +CONFIG_SDCARD_FS=y # CONFIG_NETWORK_FILESYSTEMS is not set CONFIG_NLS_CODEPAGE_437=y CONFIG_NLS_ISO8859_1=y |