kernel: Update to 3.7.7.

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

diff --git a/kernel/config-i686-legacy b/kernel/config-i686-legacy
index b7416f22e6aa3f8c62b91c019034c5164ed6828b..d399ce82085903c75b54a9aa929b1f0c15c37b43 100644 (file)
--- a/kernel/config-i686-legacy
+++ b/kernel/config-i686-legacy
@@ -3,11 +3,8 @@
 # Processor type and features
 #
 # CONFIG_XEN_PRIVILEGED_GUEST is not set
-# CONFIG_IOMMU_HELPER is not set
 CONFIG_HIGHMEM4G=y
 # CONFIG_HIGHMEM64G is not set
-# CONFIG_ARCH_PHYS_ADDR_T_64BIT is not set
-# CONFIG_ARCH_DMA_ADDR_T_64BIT is not set
 # CONFIG_PHYS_ADDR_T_64BIT is not set
 
 #
@@ -26,6 +23,10 @@ CONFIG_OLPC_XO15_SCI=y
 #
 # CONFIG_SYS_HYPERVISOR is not set
 # CONFIG_CMA is not set
+
+#
+# Bus devices
+#
 CONFIG_OF=y
 
 #
@@ -48,6 +49,7 @@ CONFIG_OF_PCI_IRQ=y
 #
 CONFIG_MDIO_BUS_MUX=m
 CONFIG_MDIO_BUS_MUX_GPIO=m
+CONFIG_MDIO_BUS_MUX_MMIOREG=m
 
 #
 # Input Device Drivers
@@ -62,7 +64,7 @@ CONFIG_MOUSE_PS2_OLPC=y
 #
 # Non-8250 serial port support
 #
-CONFIG_SERIAL_OF_PLATFORM=m
+CONFIG_SERIAL_OF_PLATFORM=y
 
 #
 # I2C system bus drivers (mostly embedded / system-on-chip)
@@ -75,6 +77,11 @@ CONFIG_I2C_PXA_PCI=y
 #
 CONFIG_OF_GPIO=y
 
+#
+# I2C GPIO expanders:
+#
+CONFIG_GPIO_ADNP=m
+
 #
 # PCI GPIO expanders:
 #
@@ -90,6 +97,7 @@ CONFIG_BATTERY_OLPC=y
 # Multifunction device drivers
 #
 CONFIG_MFD_CORE=y
+# CONFIG_MFD_SYSCON is not set
 
 #
 # I2C encoder or helper chips
@@ -104,6 +112,11 @@ CONFIG_FB_SYS_FOPS=m
 #
 # CONFIG_BACKLIGHT_OT200 is not set
 
+#
+# on-CPU RTC drivers
+#
+CONFIG_RTC_DRV_SNVS=m
+
 #
 # Microsoft Hyper-V guest support
 #