diff options
author | Takashi Iwai <tiwai@suse.de> | 2017-02-07 09:38:44 +0100 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2017-02-07 09:38:44 +0100 |
commit | 1e94320ffee29424ef70cdbb7f5601216382b7e6 (patch) | |
tree | 5558a860abefef6d348cd586cb3aa177de0d1476 /fs/ext4/Kconfig | |
parent | e1b239f371c0c745542cb8108d085ec728e8a69c (diff) | |
parent | f3d83317a69e7d658e7c83e24f8b31ac533c39e3 (diff) |
Merge branch 'for-linus' into for-next
Diffstat (limited to 'fs/ext4/Kconfig')
-rw-r--r-- | fs/ext4/Kconfig | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/fs/ext4/Kconfig b/fs/ext4/Kconfig index 7b90691e98c4..e38039fd96ff 100644 --- a/fs/ext4/Kconfig +++ b/fs/ext4/Kconfig @@ -37,7 +37,6 @@ config EXT4_FS select CRC16 select CRYPTO select CRYPTO_CRC32C - select FS_IOMAP if FS_DAX help This is the next generation of the ext3 filesystem. |