aboutsummarylogtreecommitdiffstats
path: root/config.x86_64
diff options
context:
space:
mode:
Diffstat (limited to 'config.x86_64')
-rw-r--r--config.x86_649
1 files changed, 3 insertions, 6 deletions
diff --git a/config.x86_64 b/config.x86_64
index 2ec63f038c45..6ab8fb41fc4f 100644
--- a/config.x86_64
+++ b/config.x86_64
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
-# Linux/x86 4.3.0-rc1 Kernel Configuration
+# Linux/x86 4.3.0-rc3 Kernel Configuration
#
CONFIG_64BIT=y
CONFIG_X86_64=y
@@ -51,7 +51,7 @@ CONFIG_BUILDTIME_EXTABLE_SORT=y
CONFIG_INIT_ENV_ARG_LIMIT=32
CONFIG_CROSS_COMPILE=""
# CONFIG_COMPILE_TEST is not set
-CONFIG_LOCALVERSION="-g6ff33f3"
+CONFIG_LOCALVERSION="-ge3be426"
# CONFIG_LOCALVERSION_AUTO is not set
CONFIG_HAVE_KERNEL_GZIP=y
CONFIG_HAVE_KERNEL_BZIP2=y
@@ -2693,6 +2693,7 @@ CONFIG_USB_CDC_PHONET=m
CONFIG_USB_IPHETH=m
CONFIG_USB_SIERRA_NET=m
CONFIG_USB_VL600=m
+CONFIG_USB_NET_CH9200=m
CONFIG_WLAN=y
CONFIG_PCMCIA_RAYCS=m
CONFIG_LIBERTAS_THINFIRM=m
@@ -3887,10 +3888,6 @@ CONFIG_INTEL_SOC_DTS_THERMAL=m
CONFIG_INT340X_THERMAL=m
CONFIG_ACPI_THERMAL_REL=m
CONFIG_INTEL_PCH_THERMAL=m
-
-#
-# Texas Instruments thermal drivers
-#
CONFIG_WATCHDOG=y
CONFIG_WATCHDOG_CORE=y
# CONFIG_WATCHDOG_NOWAYOUT is not set