summarylogtreecommitdiffstats
path: root/config.x86_64
diff options
context:
space:
mode:
Diffstat (limited to 'config.x86_64')
-rw-r--r--config.x86_647
1 files changed, 5 insertions, 2 deletions
diff --git a/config.x86_64 b/config.x86_64
index 7d0b5fe3e9b2..57a4d78d1452 100644
--- a/config.x86_64
+++ b/config.x86_64
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
-# Linux/x86 3.16.66-1 Kernel Configuration
+# Linux/x86 3.16.80-1 Kernel Configuration
#
CONFIG_64BIT=y
CONFIG_X86_64=y
@@ -504,6 +504,9 @@ CONFIG_X86_PAT=y
CONFIG_ARCH_USES_PG_UNCACHED=y
CONFIG_ARCH_RANDOM=y
CONFIG_X86_SMAP=y
+# CONFIG_X86_INTEL_TSX_MODE_OFF is not set
+# CONFIG_X86_INTEL_TSX_MODE_ON is not set
+CONFIG_X86_INTEL_TSX_MODE_AUTO=y
CONFIG_EFI=y
CONFIG_EFI_STUB=y
CONFIG_EFI_MIXED=y
@@ -4954,7 +4957,6 @@ CONFIG_USB_EMI62=m
CONFIG_USB_EMI26=m
CONFIG_USB_ADUTUX=m
CONFIG_USB_SEVSEG=m
-CONFIG_USB_RIO500=m
CONFIG_USB_LEGOTOWER=m
CONFIG_USB_LCD=m
CONFIG_USB_LED=m
@@ -6501,6 +6503,7 @@ CONFIG_PERCPU_TEST=m
CONFIG_ASYNC_RAID6_TEST=m
# CONFIG_TEST_STRING_HELPERS is not set
CONFIG_TEST_KSTRTOX=m
+# CONFIG_TEST_HASH is not set
# CONFIG_PROVIDE_OHCI1394_DMA_INIT is not set
# CONFIG_DMA_API_DEBUG is not set
# CONFIG_TEST_MODULE is not set