kernel: Update to version 4.1.3

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

diff --git a/kernel/config-i686-legacy b/kernel/config-i686-legacy
index baa12a65caa678e67fbffbdb1e35cba710fbe28e..bf8ef09f202356653829b0af5acfaf045984b2df 100644 (file)
--- a/kernel/config-i686-legacy
+++ b/kernel/config-i686-legacy
@@ -1,3 +1,4 @@
+CONFIG_PGTABLE_LEVELS=2
 
 #
 # Processor type and features
@@ -91,7 +92,9 @@ CONFIG_MDIO_BUS_MUX_MMIOREG=m
 #
 CONFIG_KEYBOARD_STMPE=m
 CONFIG_KEYBOARD_OMAP4=m
+CONFIG_KEYBOARD_TC3589X=m
 CONFIG_KEYBOARD_CAP11XX=m
+CONFIG_KEYBOARD_BCM=m
 CONFIG_MOUSE_PS2_OLPC=y
 CONFIG_INPUT_MAX77693_HAPTIC=m
 CONFIG_INPUT_MAX8997_HAPTIC=m
@@ -135,35 +138,35 @@ CONFIG_PINCTRL_AS3722=y
 # CONFIG_PINCTRL_SINGLE is not set
 CONFIG_PINCTRL_PALMAS=y
 CONFIG_OF_GPIO=y
-CONFIG_GPIO_GENERIC=m
 
 #
-# Memory mapped GPIO drivers:
+# Memory mapped GPIO drivers
 #
 CONFIG_GPIO_74XX_MMIO=m
+CONFIG_GPIO_ALTERA=m
+# CONFIG_GPIO_GRGPIO is not set
 # CONFIG_GPIO_SYSCON is not set
 # CONFIG_GPIO_XILINX is not set
-# CONFIG_GPIO_GRGPIO is not set
 
 #
-# I2C GPIO expanders:
+# I2C GPIO expanders
 #
-# CONFIG_GPIO_STMPE is not set
 CONFIG_GPIO_ADNP=m
 
 #
-# PCI GPIO expanders:
+# MFD GPIO expanders
 #
 CONFIG_GPIO_CS5535=y
-# CONFIG_GPIO_SODAVILLE is not set
+# CONFIG_GPIO_STMPE is not set
+# CONFIG_GPIO_TC3589X is not set
 
 #
-# SPI GPIO expanders:
+# PCI GPIO expanders
 #
-# CONFIG_GPIO_MCP23S08 is not set
+# CONFIG_GPIO_SODAVILLE is not set
 
 #
-# USB GPIO expanders:
+# USB GPIO expanders
 #
 CONFIG_BATTERY_OLPC=y
 CONFIG_POWER_RESET_AS3722=y
@@ -171,6 +174,7 @@ CONFIG_POWER_RESET_GPIO=y
 CONFIG_POWER_RESET_GPIO_RESTART=y
 CONFIG_POWER_RESET_LTC2952=y
 CONFIG_POWER_RESET_SYSCON=y
+CONFIG_POWER_RESET_SYSCON_POWEROFF=y
 
 #
 # Native drivers
@@ -202,6 +206,7 @@ CONFIG_MFD_STMPE=y
 # STMicroelectronics STMPE Interface Drivers
 #
 CONFIG_STMPE_I2C=y
+CONFIG_MFD_TC3589X=y
 CONFIG_REGULATOR_AS3722=m
 CONFIG_REGULATOR_HI6421=m
 CONFIG_REGULATOR_MAX77686=m
@@ -210,10 +215,16 @@ CONFIG_REGULATOR_PWM=m
 CONFIG_REGULATOR_RK808=m
 CONFIG_REGULATOR_TPS65218=m
 
+#
+# Media digital TV PCI Adapters
+#
+# CONFIG_VIDEO_XILINX is not set
+
 #
 # I2C encoder or helper chips
 #
 CONFIG_DRM_PTN3460=m
+CONFIG_DRM_PS8622=m
 
 #
 # Display Panels
@@ -232,6 +243,11 @@ CONFIG_BACKLIGHT_PWM=m
 # CONFIG_BACKLIGHT_LP8788 is not set
 # CONFIG_BACKLIGHT_OT200 is not set
 
+#
+# Gadget/Dual-role mode requires USB Gadget support to be enabled
+#
+CONFIG_USB_CHIPIDEA_OF=m
+
 #
 # MMC/SD/SDIO Host Controller Drivers
 #
@@ -266,7 +282,6 @@ CONFIG_RTC_DRV_SNVS=m
 # DMA Devices
 #
 CONFIG_FSL_EDMA=m
-CONFIG_DMA_VIRTUAL_CHANNELS=m
 CONFIG_DMA_OF=y
 
 #
@@ -290,17 +305,7 @@ CONFIG_COMMON_CLK_MAX77802=m
 CONFIG_COMMON_CLK_RK808=m
 # CONFIG_COMMON_CLK_SI5351 is not set
 CONFIG_COMMON_CLK_SI570=m
-CONFIG_COMMON_CLK_QCOM=m
-CONFIG_APQ_GCC_8084=m
-CONFIG_APQ_MMCC_8084=m
-CONFIG_IPQ_GCC_806X=m
-CONFIG_IPQ_LCC_806X=m
-CONFIG_MSM_GCC_8660=m
-CONFIG_MSM_GCC_8960=m
-CONFIG_MSM_LCC_8960=m
-CONFIG_MSM_MMCC_8960=m
-CONFIG_MSM_GCC_8974=m
-CONFIG_MSM_MMCC_8974=m
+CONFIG_COMMON_CLK_PWM=m
 
 #
 # Generic IOMMU Pagetable Support