summaryrefslogtreecommitdiffstats
path: root/config-generic
diff options
context:
space:
mode:
authorJustin M. Forbes <jforbes@redhat.com>2013-07-09 16:19:07 -0500
committerJustin M. Forbes <jforbes@redhat.com>2013-07-09 16:19:07 -0500
commite1d6f3889c1511a6e17e19849db17e5c607664da (patch)
treea4dd3f4b90843d7e4db06c5a25be9b42547f935b /config-generic
parent650cdc7e7507de6b345ec58080502bd1a3e120a2 (diff)
downloadkernel-e1d6f3889c1511a6e17e19849db17e5c607664da.tar.gz
kernel-e1d6f3889c1511a6e17e19849db17e5c607664da.tar.xz
kernel-e1d6f3889c1511a6e17e19849db17e5c607664da.zip
Linux v3.10-6378-ga82a729
Diffstat (limited to 'config-generic')
-rw-r--r--config-generic5
1 files changed, 5 insertions, 0 deletions
diff --git a/config-generic b/config-generic
index 48d14bad9..d35de6c16 100644
--- a/config-generic
+++ b/config-generic
@@ -3815,6 +3815,8 @@ CONFIG_NFS_V4=y
CONFIG_NFS_SWAP=y
CONFIG_NFS_V4_1=y
CONFIG_NFS_V4_1_IMPLEMENTATION_ID_DOMAIN="kernel.org"
+CONFIG_NFS_V4_2=y
+NFS_V4_SECURITY_LABEL=y
CONFIG_NFSD=m
CONFIG_NFSD_V3=y
CONFIG_NFSD_V3_ACL=y
@@ -3890,6 +3892,7 @@ CONFIG_UBIFS_FS_XATTR=y
#
CONFIG_PARTITION_ADVANCED=y
# CONFIG_ACORN_PARTITION is not set
+CONFIG_AIX_PARTITION=y
CONFIG_AMIGA_PARTITION=y
# CONFIG_ATARI_PARTITION is not set
CONFIG_BSD_DISKLABEL=y
@@ -4108,6 +4111,8 @@ CONFIG_CRYPTO_HMAC=y
CONFIG_CRYPTO_KHAZAD=m
CONFIG_CRYPTO_LRW=m
CONFIG_CRYPTO_LZO=m
+CONFIG_CRYPTO_LZ4=m
+CONFIG_CRYPTO_LZ4HC=m
CONFIG_CRYPTO_MD4=m
CONFIG_CRYPTO_MD5=m
CONFIG_CRYPTO_MICHAEL_MIC=m