kernel: Update to 3.16.2

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

diff --git a/kernel/config-i686-legacy b/kernel/config-i686-legacy
index 2de8875769135e382e2af10568cc260d3f926ef1..6f806c0f9a3f33ce9c7a394bf8fae7f05472fd57 100644 (file)
--- a/kernel/config-i686-legacy
+++ b/kernel/config-i686-legacy
@@ -13,6 +13,11 @@ CONFIG_HIGHMEM4G=y
 # CONFIG_VMSPLIT_2G_OPT is not set
 # CONFIG_PHYS_ADDR_T_64BIT is not set
 
+#
+# CPU Frequency scaling
+#
+# CONFIG_GENERIC_CPUFREQ_CPU0 is not set
+
 #
 # Bus options (PCI etc.)
 #
@@ -66,12 +71,15 @@ CONFIG_OF_PCI_IRQ=y
 #
 # Distributed Switch Architecture drivers
 #
+CONFIG_AMD_XGBE=m
 # CONFIG_ARC_EMAC is not set
 CONFIG_BCMGENET=m
+CONFIG_SYSTEMPORT=m
 
 #
 # MII PHY device drivers
 #
+CONFIG_AMD_XGBE_PHY=m
 CONFIG_MDIO_BUS_MUX=m
 CONFIG_MDIO_BUS_MUX_GPIO=m
 CONFIG_MDIO_BUS_MUX_MMIOREG=m
@@ -79,6 +87,8 @@ CONFIG_MDIO_BUS_MUX_MMIOREG=m
 #
 # Input Device Drivers
 #
+CONFIG_KEYBOARD_STMPE=m
+CONFIG_KEYBOARD_OMAP4=m
 CONFIG_MOUSE_PS2_OLPC=y
 CONFIG_INPUT_MAX8997_HAPTIC=m
 # CONFIG_INPUT_GPIO_BEEPER is not set
@@ -111,6 +121,7 @@ CONFIG_SERIAL_OF_PLATFORM=y
 #
 CONFIG_I2C_PXA=m
 CONFIG_I2C_PXA_PCI=y
+CONFIG_I2C_RK3X=m
 
 #
 # Pin controllers
@@ -121,10 +132,12 @@ CONFIG_GENERIC_PINCONF=y
 CONFIG_PINCTRL_AS3722=y
 CONFIG_PINCTRL_BCM281XX=y
 CONFIG_PINCTRL_MSM=y
-CONFIG_PINCTRL_MSM8X74=m
+CONFIG_PINCTRL_APQ8064=y
+CONFIG_PINCTRL_IPQ8064=y
 # CONFIG_PINCTRL_SINGLE is not set
 CONFIG_PINCTRL_PALMAS=y
 CONFIG_OF_GPIO=y
+CONFIG_GPIOLIB_IRQCHIP=y
 
 #
 # Memory mapped GPIO drivers:
@@ -136,6 +149,7 @@ CONFIG_OF_GPIO=y
 #
 # I2C GPIO expanders:
 #
+# CONFIG_GPIO_STMPE is not set
 CONFIG_GPIO_ADNP=m
 
 #
@@ -175,12 +189,21 @@ CONFIG_POWER_RESET_GPIO=y
 # Multifunction device drivers
 #
 CONFIG_MFD_AS3722=y
+CONFIG_MFD_STMPE=y
+
+#
+# STMicroelectronics STMPE Interface Drivers
+#
+CONFIG_STMPE_I2C=y
 
 #
 # Frame buffer hardware drivers
 #
 # CONFIG_FB_SSD1307 is not set
 CONFIG_BACKLIGHT_PWM=m
+# CONFIG_BACKLIGHT_LM3630A is not set
+# CONFIG_BACKLIGHT_LP855X is not set
+# CONFIG_BACKLIGHT_LP8788 is not set
 # CONFIG_BACKLIGHT_OT200 is not set
 
 #
@@ -226,6 +249,7 @@ CONFIG_DMA_OF=y
 # Android
 #
 CONFIG_XO1_RFKILL=m
+# CONFIG_XO15_EBOOK is not set
 
 #
 # Common Clock Framework
@@ -247,7 +271,6 @@ CONFIG_OF_IOMMU=y
 #
 # Analog to digital converters
 #
-# CONFIG_EXYNOS_ADC is not set
 CONFIG_VF610_ADC=m
 
 #