kernel: Update to version 4.2

[people/amarx/ipfire-3.x.git] / kernel / config-i686-default

diff --git a/kernel/config-i686-default b/kernel/config-i686-default
index dceb7e13cacb068693a8d384198bf525c998b5d8..c54e3ee0838aa77cf6906a503e3dd7aee8930bad 100644 (file)
--- a/kernel/config-i686-default
+++ b/kernel/config-i686-default
@@ -17,11 +17,6 @@ CONFIG_NO_HZ_IDLE=y
 # CONFIG_TICK_CPU_ACCOUNTING is not set
 CONFIG_IRQ_TIME_ACCOUNTING=y
 
-#
-# RCU Subsystem
-#
-CONFIG_RCU_FANOUT=32
-
 #
 # Kernel Performance Events And Counters
 #
@@ -199,6 +194,7 @@ CONFIG_PCH_GBE=m
 #
 # Input Device Drivers
 #
+# CONFIG_KEYBOARD_STMPE is not set
 # CONFIG_INPUT_WISTRON_BTNS is not set
 
 #
@@ -225,6 +221,7 @@ CONFIG_I2C_SIS630=m
 #
 CONFIG_I2C_DESIGNWARE_BAYTRAIL=y
 # CONFIG_I2C_EG20T is not set
+# CONFIG_I2C_PXA is not set
 
 #
 # Other I2C/SMBus bus drivers
@@ -239,24 +236,39 @@ CONFIG_PTP_1588_CLOCK_PCH=m
 #
 # MFD GPIO expanders
 #
-# CONFIG_GPIO_CS5535 is not set
+CONFIG_GPIO_CS5535=m
+# CONFIG_GPIO_TC3589X is not set
 
 #
 # PCI GPIO expanders
 #
-# CONFIG_GPIO_PCH is not set
+CONFIG_GPIO_PCH=m
+
+#
+# USB GPIO expanders
+#
+# CONFIG_POWER_RESET_AS3722 is not set
+
+#
+# ACPI drivers
+#
+CONFIG_INTEL_QUARK_DTS_THERMAL=m
 
 #
 # Watchdog Device Drivers
 #
 CONFIG_GEODE_WDT=m
-# CONFIG_SBC8360_WDT is not set
-# CONFIG_SBC7240_WDT is not set
+CONFIG_SBC8360_WDT=m
+CONFIG_SBC7240_WDT=m
 
 #
 # Multifunction device drivers
 #
 CONFIG_MFD_CS5535=m
+
+#
+# STMicroelectronics STMPE Interface Drivers
+#
 # CONFIG_MFD_TIMBERDALE is not set
 
 #
@@ -284,6 +296,7 @@ CONFIG_VIDEO_OV7670=m
 #
 # CONFIG_FB_I810 is not set
 # CONFIG_FB_GEODE is not set
+# CONFIG_BACKLIGHT_OT200 is not set
 
 #
 # Console display driver support
@@ -315,6 +328,7 @@ CONFIG_PCH_DMA=m
 #
 # Android
 #
+# CONFIG_COMMON_CLK_XLNX_CLKWZRD is not set
 CONFIG_TC1100_WMI=m
 CONFIG_INTEL_IMR=y
 
@@ -347,7 +361,7 @@ CONFIG_CRYPTO_GLUE_HELPER_X86=m
 # Ciphers
 #
 CONFIG_CRYPTO_AES_586=y
-# CONFIG_CRYPTO_SALSA20_586 is not set
+CONFIG_CRYPTO_SALSA20_586=m
 CONFIG_CRYPTO_SERPENT_SSE2_586=m
 CONFIG_CRYPTO_TWOFISH_586=m