summaryrefslogtreecommitdiffstats
path: root/config-generic
diff options
context:
space:
mode:
authorJosh Boyer <jwboyer@fedoraproject.org>2015-02-13 11:00:04 -0500
committerJosh Boyer <jwboyer@fedoraproject.org>2015-02-13 11:00:04 -0500
commit87b2a17d8cd45e1bb04d49c89ae7af476bcd917c (patch)
tree24ce81def04974ec7f60322ad2528aebdc84e5b1 /config-generic
parentfe6305dc490a4abd630b3bbe6a9b1e8cb6e37bb8 (diff)
downloadkernel-87b2a17d8cd45e1bb04d49c89ae7af476bcd917c.tar.gz
kernel-87b2a17d8cd45e1bb04d49c89ae7af476bcd917c.tar.xz
kernel-87b2a17d8cd45e1bb04d49c89ae7af476bcd917c.zip
Linux v3.19-5015-gc7d7b9867155
Diffstat (limited to 'config-generic')
-rw-r--r--config-generic6
1 files changed, 6 insertions, 0 deletions
diff --git a/config-generic b/config-generic
index fd2ce5021..63aa4715a 100644
--- a/config-generic
+++ b/config-generic
@@ -4243,6 +4243,7 @@ CONFIG_F2FS_FS_XATTR=y
CONFIG_F2FS_FS_POSIX_ACL=y
CONFIG_F2FS_FS_SECURITY=y
# CONFIG_F2FS_CHECK_FS is not set
+# CONFIG_F2FS_IO_TRACE is not set
#
# Network File Systems
@@ -4262,6 +4263,7 @@ CONFIG_NFSD=m
CONFIG_NFSD_V3=y
CONFIG_NFSD_V3_ACL=y
CONFIG_NFSD_V4=y
+CONFIG_NFSD_PNFS=y
CONFIG_NFSD_V4_SECURITY_LABEL=y
CONFIG_NFS_FSCACHE=y
# CONFIG_NFS_USE_LEGACY_DNS is not set
@@ -5274,6 +5276,7 @@ CONFIG_FRONTSWAP=y
CONFIG_ZSWAP=y
CONFIG_ZBUD=y
CONFIG_ZSMALLOC=y
+# CONFIG_ZSMALLOC_STAT is not set
# CONFIG_PGTABLE_MAPPING is not set
# CONFIG_MDIO_GPIO is not set
@@ -5359,6 +5362,7 @@ CONFIG_PSTORE_RAM=m
# CONFIG_TEST_USER_COPY is not set
# CONFIG_TEST_BPF is not set
# CONFIG_TEST_UDELAY is not set
+# CONFIG_TEST_HEXDUMP is not set
# CONFIG_TEST_RHASHTABLE is not set
# CONFIG_AVERAGE is not set
@@ -5379,6 +5383,8 @@ CONFIG_BCMA_DRIVER_GPIO=y
# CONFIG_GOOGLE_FIRMWARE is not set
# CONFIG_INTEL_MID_PTI is not set
CONFIG_IOMMU_SUPPORT=y
+# CONFIG_IOMMU_IO_PGTABLE_LPAE is not set
+# CONFIG_IOMMU_IO_PGTABLE_LPAE_SELFTEST is not set
# CONFIG_MAILBOX is not set
# CONFIG_ALTERA_MBOX is not set