diff options
| author | Mikael Eriksson | 2016-08-16 13:54:19 +0200 |
|---|---|---|
| committer | Mikael Eriksson | 2016-08-16 13:54:19 +0200 |
| commit | f81e034fc6ac070a681c5b71e824457869ff34f3 (patch) | |
| tree | bb408266e5c26ca20f4a7d15a08dad62331a9fd0 | |
| parent | 210f7ff513c1e0451fd145a0f7c1363fe2de5a49 (diff) | |
| download | aur-f81e034fc6ac070a681c5b71e824457869ff34f3.tar.gz | |
Import configs from 4.7-1
| -rw-r--r-- | .SRCINFO | 2 | ||||
| -rw-r--r-- | config | 4 | ||||
| -rw-r--r-- | config.x86_64 | 4 |
3 files changed, 5 insertions, 5 deletions
@@ -1,5 +1,5 @@ # Generated by mksrcinfo v8 -# Tue Aug 16 11:53:08 UTC 2016 +# Tue Aug 16 11:54:19 UTC 2016 pkgbase = linux-mainline pkgver = 4.8rc2 pkgrel = 1 @@ -543,7 +543,7 @@ CONFIG_X86_PAT=y CONFIG_ARCH_USES_PG_UNCACHED=y CONFIG_ARCH_RANDOM=y CONFIG_X86_SMAP=y -# CONFIG_X86_INTEL_MPX is not set +CONFIG_X86_INTEL_MPX=y CONFIG_EFI=y CONFIG_EFI_STUB=y CONFIG_SECCOMP=y @@ -6377,7 +6377,7 @@ CONFIG_ASYNC_TX_DMA=y # # DMABUF options # -# CONFIG_SYNC_FILE is not set +CONFIG_SYNC_FILE=y CONFIG_AUXDISPLAY=y CONFIG_KS0108=m CONFIG_KS0108_PORT=0x378 diff --git a/config.x86_64 b/config.x86_64 index 88ea7bb75283..c197e7ae8bce 100644 --- a/config.x86_64 +++ b/config.x86_64 @@ -563,7 +563,7 @@ CONFIG_X86_PAT=y CONFIG_ARCH_USES_PG_UNCACHED=y CONFIG_ARCH_RANDOM=y CONFIG_X86_SMAP=y -# CONFIG_X86_INTEL_MPX is not set +CONFIG_X86_INTEL_MPX=y CONFIG_X86_INTEL_MEMORY_PROTECTION_KEYS=y CONFIG_EFI=y CONFIG_EFI_STUB=y @@ -6151,7 +6151,7 @@ CONFIG_DMA_ENGINE_RAID=y # # DMABUF options # -# CONFIG_SYNC_FILE is not set +CONFIG_SYNC_FILE=y CONFIG_DCA=m CONFIG_AUXDISPLAY=y CONFIG_KS0108=m |