diff options
| author | yardenac | 2013-02-05 12:49:02 -0800 |
|---|---|---|
| committer | yar | 2015-07-03 16:58:21 -0700 |
| commit | 137e9fd7672392e64df001b512a346ddca7c3644 (patch) | |
| tree | 4d20f72c9036048fedbbf66eb261e1b601ce41d0 /config.x86_64 | |
| parent | 94e7e39dd7e49ace2876ca0ab3e472beec9f85bd (diff) | |
| download | aur-137e9fd7672392e64df001b512a346ddca7c3644.tar.gz | |
merge config updates from mainline (x86_64)
Diffstat (limited to 'config.x86_64')
| -rw-r--r-- | config.x86_64 | 31 |
1 files changed, 27 insertions, 4 deletions
diff --git a/config.x86_64 b/config.x86_64 index 2fdf57a504ec..06fb4713edce 100644 --- a/config.x86_64 +++ b/config.x86_64 @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86_64 3.7.2-1 Kernel Configuration +# Linux/x86_64 3.7.6-1 Kernel Configuration # CONFIG_64BIT=y CONFIG_X86_64=y @@ -380,7 +380,7 @@ CONFIG_KSM=y CONFIG_DEFAULT_MMAP_MIN_ADDR=4096 # CONFIG_TRANSPARENT_HUGEPAGE is not set CONFIG_CROSS_MEMORY_ATTACH=y -# CONFIG_CLEANCACHE is not set +CONFIG_CLEANCACHE=y CONFIG_FRONTSWAP=y # CONFIG_X86_CHECK_BIOS_CORRUPTION is not set CONFIG_X86_RESERVE_LOW=64 @@ -607,6 +607,7 @@ CONFIG_NETFILTER_XT_TARGET_MARK=y CONFIG_NETFILTER_XT_TARGET_NETMAP=m CONFIG_NETFILTER_XT_TARGET_NFLOG=m CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m +# CONFIG_NETFILTER_XT_TARGET_NOTRACK is not set CONFIG_NETFILTER_XT_TARGET_RATEEST=y CONFIG_NETFILTER_XT_TARGET_REDIRECT=m CONFIG_NETFILTER_XT_TARGET_TEE=m @@ -1100,6 +1101,7 @@ CONFIG_DUMMY_CONSOLE=y # Xen driver support # CONFIG_XEN_BALLOON=y +# CONFIG_XEN_SELFBALLOONING is not set CONFIG_XEN_SCRUB_PAGES=y CONFIG_XEN_DEV_EVTCHN=y CONFIG_XENFS=y @@ -1110,7 +1112,28 @@ CONFIG_XEN_GNTDEV=m CONFIG_XEN_GRANT_DEV_ALLOC=m CONFIG_XEN_TMEM=y CONFIG_XEN_PRIVCMD=y -# CONFIG_STAGING is not set +CONFIG_STAGING=y +# CONFIG_ECHO is not set +# CONFIG_COMEDI is not set +# CONFIG_ZSMALLOC is not set +# CONFIG_FT1000 is not set + +# +# Speakup console speech +# +# CONFIG_SPEAKUP is not set +# CONFIG_STAGING_MEDIA is not set + +# +# Android +# +# CONFIG_ANDROID is not set +# CONFIG_PHONE is not set +# CONFIG_IPACK_BUS is not set +# CONFIG_WIMAX_GDM72XX is not set +CONFIG_ZCACHE2=y +CONFIG_RAMSTER=y +# CONFIG_DGRP is not set # CONFIG_X86_PLATFORM_DEVICES is not set # @@ -1232,7 +1255,7 @@ CONFIG_TMPFS_POSIX_ACL=y CONFIG_TMPFS_XATTR=y CONFIG_HUGETLBFS=y CONFIG_HUGETLB_PAGE=y -CONFIG_CONFIGFS_FS=m +CONFIG_CONFIGFS_FS=y CONFIG_MISC_FILESYSTEMS=y # CONFIG_ADFS_FS is not set # CONFIG_AFFS_FS is not set |