kernel: Update to 3.15.6.

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

diff --git a/kernel/config-i686-default b/kernel/config-i686-default
index 9f81e2121949fc15b5f742bfb41adb204d5ec377..b098b68f5dc3b00f788a09d7fe72195e2fc8810c 100644 (file)
--- a/kernel/config-i686-default
+++ b/kernel/config-i686-default
@@ -51,10 +51,7 @@ CONFIG_X86_BIGSMP=y
 # CONFIG_X86_INTEL_MID is not set
 # CONFIG_X86_RDC321X is not set
 CONFIG_X86_32_NON_STANDARD=y
 # CONFIG_X86_INTEL_MID is not set
 # CONFIG_X86_RDC321X is not set
 CONFIG_X86_32_NON_STANDARD=y

-# CONFIG_X86_NUMAQ is not set

 # CONFIG_STA2X11 is not set
 # CONFIG_STA2X11 is not set

-# CONFIG_X86_SUMMIT is not set
-# CONFIG_X86_ES7000 is not set

 CONFIG_X86_32_IRIS=m
 CONFIG_XEN_MAX_DOMAIN_MEMORY=64
 # CONFIG_LGUEST_GUEST is not set
 CONFIG_X86_32_IRIS=m
 CONFIG_XEN_MAX_DOMAIN_MEMORY=64
 # CONFIG_LGUEST_GUEST is not set


@@ -191,7 +188,11 @@ CONFIG_CS5535_CLOCK_EVENT_SRC=m
 #
 # PATA SFF controllers with BMDMA
 #
 #
 # PATA SFF controllers with BMDMA
 #

+CONFIG_PATA_CS5520=m
+CONFIG_PATA_CS5530=m

 # CONFIG_PATA_CS5535 is not set
 # CONFIG_PATA_CS5535 is not set

+CONFIG_PATA_CS5536=m
+# CONFIG_PATA_SC1200 is not set

 
 #
 # Input Device Drivers
 
 #
 # Input Device Drivers


@@ -201,6 +202,7 @@ CONFIG_CS5535_CLOCK_EVENT_SRC=m
 #
 # Non-8250 serial port support
 #
 #
 # Non-8250 serial port support
 #

+# CONFIG_SERIAL_TIMBERDALE is not set

 CONFIG_HW_RANDOM_GEODE=m
 CONFIG_SONYPI=m
 CONFIG_PC8736x_GPIO=m
 CONFIG_HW_RANDOM_GEODE=m
 CONFIG_SONYPI=m
 CONFIG_PC8736x_GPIO=m


@@ -255,8 +257,16 @@ CONFIG_VIDEO_OV7670=m
 #
 # Console display driver support
 #
 #
 # Console display driver support
 #

+CONFIG_SND_SB16_DSP=m
+CONFIG_SND_CS5530=m
+CONFIG_SND_CS5535AUDIO=m

 # CONFIG_SND_SIS7019 is not set
 
 # CONFIG_SND_SIS7019 is not set
 

+#
+# LED drivers
+#
+CONFIG_LEDS_OT200=m
+

 #
 # iptables trigger is under Netfilter config (LED target)
 #
 #
 # iptables trigger is under Netfilter config (LED target)
 #