kernel: Update to 3.13.2.

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

diff --git a/kernel/config-i686-legacy b/kernel/config-i686-legacy
index 7bb09dc982c002bb66005e8ee203c7b7cb97e61a..c3ae439d5f31a89ddde1851453eafa2f28bcfb11 100644 (file)
--- a/kernel/config-i686-legacy
+++ b/kernel/config-i686-legacy
@@ -28,7 +28,18 @@ CONFIG_OLPC_XO15_SCI=y
 # Generic Driver Options
 #
 # CONFIG_SYS_HYPERVISOR is not set
-# CONFIG_CMA is not set
+CONFIG_DMA_CMA=y
+
+#
+# Default contiguous memory area size:
+#
+CONFIG_CMA_SIZE_MBYTES=16
+CONFIG_CMA_SIZE_SEL_MBYTES=y
+# CONFIG_CMA_SIZE_SEL_PERCENTAGE is not set
+# CONFIG_CMA_SIZE_SEL_MIN is not set
+# CONFIG_CMA_SIZE_SEL_MAX is not set
+CONFIG_CMA_ALIGNMENT=8
+CONFIG_CMA_AREAS=7
 
 #
 # Bus devices
@@ -43,7 +54,6 @@ CONFIG_PROC_DEVICETREE=y
 CONFIG_OF_PROMTREE=y
 CONFIG_OF_ADDRESS=y
 CONFIG_OF_IRQ=y
-CONFIG_OF_I2C=m
 CONFIG_OF_NET=y
 CONFIG_OF_MDIO=y
 CONFIG_OF_PCI=y
@@ -65,7 +75,6 @@ CONFIG_MDIO_BUS_MUX_MMIOREG=m
 # Input Device Drivers
 #
 CONFIG_MOUSE_PS2_OLPC=y
-CONFIG_INPUT_PWM_BEEPER=m
 
 #
 # Hardware I/O ports
@@ -91,8 +100,9 @@ CONFIG_I2C_PXA=m
 CONFIG_I2C_PXA_PCI=y
 
 #
-# Enable PHYLIB and NETWORK_PHY_TIMESTAMPING to see the additional clocks.
+# Pin controllers
 #
+# CONFIG_PINCTRL_SINGLE is not set
 CONFIG_OF_GPIO=y
 
 #
@@ -111,6 +121,11 @@ CONFIG_GPIO_ADNP=m
 CONFIG_GPIO_CS5535=y
 # CONFIG_GPIO_SODAVILLE is not set
 
+#
+# MODULbus GPIO expanders:
+#
+# CONFIG_GPIO_BCM_KONA is not set
+
 #
 # 1-wire Slaves
 #
@@ -174,13 +189,18 @@ CONFIG_OF_IOMMU=y
 # CONFIG_EXYNOS_ADC is not set
 
 #
-# Pressure Sensors
+# Temperature sensors
 #
 CONFIG_PWM=y
 CONFIG_PWM_SYSFS=y
 CONFIG_PWM_PCA9685=m
 CONFIG_IRQCHIP=y
 
+#
+# PHY Subsystem
+#
+CONFIG_PHY_EXYNOS_DP_VIDEO=m
+
 #
 # Non-executable pages
 #