diff options
| author | Takashi Iwai <tiwai@suse.de> | 2015-05-29 10:27:50 +0200 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2015-05-29 10:27:50 +0200 |
| commit | 984a8547052711867332eeaec4141755fc040553 (patch) | |
| tree | c8bbc1e16d11c023e1a7ec0421401be0a0e4a304 /fs/ext4/Kconfig | |
| parent | 3270f0dd1a35d6b785bf39e1ed7ed6e1e43c8ebb (diff) | |
| parent | b47eee2e0a7de623c24dbcaf303c3bf2b5155455 (diff) | |
Merge branch 'for-linus' into for-next
Merge back the latest HD-audio stuff for further development.
Diffstat (limited to 'fs/ext4/Kconfig')
| -rw-r--r-- | fs/ext4/Kconfig | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/fs/ext4/Kconfig b/fs/ext4/Kconfig index 18228c201f7f..024f2284d3f6 100644 --- a/fs/ext4/Kconfig +++ b/fs/ext4/Kconfig @@ -64,8 +64,8 @@ config EXT4_FS_SECURITY If you are not using a security module that requires using extended attributes for file security labels, say N. -config EXT4_FS_ENCRYPTION - bool "Ext4 Encryption" +config EXT4_ENCRYPTION + tristate "Ext4 Encryption" depends on EXT4_FS select CRYPTO_AES select CRYPTO_CBC @@ -81,6 +81,11 @@ config EXT4_FS_ENCRYPTION efficient since it avoids caching the encrypted and decrypted pages in the page cache. +config EXT4_FS_ENCRYPTION + bool + default y + depends on EXT4_ENCRYPTION + config EXT4_DEBUG bool "EXT4 debugging support" depends on EXT4_FS |