summarylogtreecommitdiffstats
path: root/config
diff options
context:
space:
mode:
authorMikael Eriksson2016-08-16 13:54:19 +0200
committerMikael Eriksson2016-08-16 13:54:19 +0200
commitf81e034fc6ac070a681c5b71e824457869ff34f3 (patch)
treebb408266e5c26ca20f4a7d15a08dad62331a9fd0 /config
parent210f7ff513c1e0451fd145a0f7c1363fe2de5a49 (diff)
downloadaur-f81e034fc6ac070a681c5b71e824457869ff34f3.tar.gz
Import configs from 4.7-1
Diffstat (limited to 'config')
-rw-r--r--config4
1 files changed, 2 insertions, 2 deletions
diff --git a/config b/config
index c925c30f136f..76db9b18c6ea 100644
--- a/config
+++ b/config
@@ -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