summaryrefslogtreecommitdiffstats
path: root/config-generic
diff options
context:
space:
mode:
authorJosh Boyer <jwboyer@fedoraproject.org>2015-04-20 08:58:25 -0400
committerJosh Boyer <jwboyer@fedoraproject.org>2015-04-20 08:58:25 -0400
commited8080d353cde949705f611562ab2be1a5099160 (patch)
tree404ad523e725fa8f41bffd32879bc97f61d079fd /config-generic
parent814e7c84f7e50a95290d32382ca970cb729e78ed (diff)
downloadkernel-ed8080d353cde949705f611562ab2be1a5099160.tar.gz
kernel-ed8080d353cde949705f611562ab2be1a5099160.tar.xz
kernel-ed8080d353cde949705f611562ab2be1a5099160.zip
Linux v4.0-8158-g09d51602cf84
Diffstat (limited to 'config-generic')
-rw-r--r--config-generic2
1 files changed, 2 insertions, 0 deletions
diff --git a/config-generic b/config-generic
index bbf2a2935..b32831c8f 100644
--- a/config-generic
+++ b/config-generic
@@ -365,6 +365,7 @@ CONFIG_BLK_DEV_OSD=m
CONFIG_BLK_DEV_RAM=m
CONFIG_BLK_DEV_RAM_COUNT=16
CONFIG_BLK_DEV_RAM_SIZE=16384
+CONFIG_BLK_DEV_PMEM=m
CONFIG_BLK_DEV_INITRD=y
CONFIG_BLK_DEV_IO_TRACE=y
@@ -4167,6 +4168,7 @@ CONFIG_EXT4_FS=y
CONFIG_EXT4_USE_FOR_EXT23=y
CONFIG_EXT4_FS_POSIX_ACL=y
CONFIG_EXT4_FS_SECURITY=y
+# CONFIG_EXT4_FS_ENCRYPTION is not set
CONFIG_JBD2=y
CONFIG_FS_MBCACHE=y
CONFIG_REISERFS_FS=m