kernel: Update to 3.15.6.

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

diff --git a/kernel/config-i686-legacy b/kernel/config-i686-legacy
index 9ce120105e417cf2c4616c4ce6d248d8996ccd7a..2de8875769135e382e2af10568cc260d3f926ef1 100644 (file)
--- a/kernel/config-i686-legacy
+++ b/kernel/config-i686-legacy
@@ -7,7 +7,6 @@
 #
 # Processor type and features
 #
-# CONFIG_XEN_PRIVILEGED_GUEST is not set
 CONFIG_HIGHMEM4G=y
 # CONFIG_HIGHMEM64G is not set
 # CONFIG_VMSPLIT_3G_OPT is not set
@@ -33,7 +32,6 @@ CONFIG_OLPC_XO15_SCI=y
 # Generic Driver Options
 #
 # CONFIG_SYS_HYPERVISOR is not set
-CONFIG_REGMAP_MMIO=m
 CONFIG_DMA_CMA=y
 
 #
@@ -55,10 +53,10 @@ CONFIG_OF=y
 #
 # Device Tree and Open Firmware support
 #
-CONFIG_PROC_DEVICETREE=y
 # CONFIG_OF_SELFTEST is not set
 CONFIG_OF_PROMTREE=y
 CONFIG_OF_ADDRESS=y
+CONFIG_OF_ADDRESS_PCI=y
 CONFIG_OF_IRQ=y
 CONFIG_OF_NET=y
 CONFIG_OF_MDIO=y
@@ -69,6 +67,7 @@ CONFIG_OF_PCI_IRQ=y
 # Distributed Switch Architecture drivers
 #
 # CONFIG_ARC_EMAC is not set
+CONFIG_BCMGENET=m
 
 #
 # MII PHY device drivers
@@ -81,7 +80,9 @@ CONFIG_MDIO_BUS_MUX_MMIOREG=m
 # Input Device Drivers
 #
 CONFIG_MOUSE_PS2_OLPC=y
+CONFIG_INPUT_MAX8997_HAPTIC=m
 # CONFIG_INPUT_GPIO_BEEPER is not set
+CONFIG_INPUT_PWM_BEEPER=m
 
 #
 # Hardware I/O ports
@@ -118,7 +119,7 @@ CONFIG_PINMUX=y
 CONFIG_PINCONF=y
 CONFIG_GENERIC_PINCONF=y
 CONFIG_PINCTRL_AS3722=y
-# CONFIG_PINCTRL_CAPRI is not set
+CONFIG_PINCTRL_BCM281XX=y
 CONFIG_PINCTRL_MSM=y
 CONFIG_PINCTRL_MSM8X74=m
 # CONFIG_PINCTRL_SINGLE is not set
@@ -128,6 +129,8 @@ CONFIG_OF_GPIO=y
 #
 # Memory mapped GPIO drivers:
 #
+# CONFIG_GPIO_DWAPB is not set
+# CONFIG_GPIO_SYSCON is not set
 # CONFIG_GPIO_GRGPIO is not set
 
 #
@@ -176,14 +179,10 @@ CONFIG_MFD_AS3722=y
 #
 # Frame buffer hardware drivers
 #
+# CONFIG_FB_SSD1307 is not set
 CONFIG_BACKLIGHT_PWM=m
 # CONFIG_BACKLIGHT_OT200 is not set
 
-#
-# Console display driver support
-#
-# CONFIG_FB_SSD1307 is not set
-
 #
 # USB Imaging devices
 #
@@ -214,6 +213,8 @@ CONFIG_RTC_DRV_SNVS=m
 #
 # DMA Devices
 #
+CONFIG_FSL_EDMA=m
+CONFIG_DMA_VIRTUAL_CHANNELS=m
 CONFIG_DMA_OF=y
 
 #
@@ -247,23 +248,21 @@ CONFIG_OF_IOMMU=y
 # Analog to digital converters
 #
 # CONFIG_EXYNOS_ADC is not set
+CONFIG_VF610_ADC=m
 
 #
 # Temperature sensors
 #
 CONFIG_PWM=y
 CONFIG_PWM_SYSFS=y
+CONFIG_PWM_FSL_FTM=m
 CONFIG_PWM_LP3943=m
+CONFIG_PWM_LPSS=m
 CONFIG_PWM_PCA9685=m
 CONFIG_PWM_TWL=m
 CONFIG_PWM_TWL_LED=m
 CONFIG_IRQCHIP=y
 
-#
-# PHY Subsystem
-#
-CONFIG_PHY_EXYNOS_DP_VIDEO=m
-
 #
 # Non-executable pages
 #