x86: use libata in 2.6.30, fix pata support for sc1200 (used on wrap)

[openwrt.git] / target / linux / generic-2.6 / config-2.6.31

diff --git a/target/linux/generic-2.6/config-2.6.31 b/target/linux/generic-2.6/config-2.6.31
index ccd8835..f262b6e 100644 (file)
--- a/target/linux/generic-2.6/config-2.6.31
+++ b/target/linux/generic-2.6/config-2.6.31
@@ -4,6 +4,7 @@
 # CONFIG_PPC_256K_PAGES is not set
 CONFIG_PPC_4K_PAGES=y
 # CONFIG_PPC_64K_PAGES is not set
+# CONFIG_PPC_EMULATED_STATS is not set
 # CONFIG_PCIEASPM is not set
 # CONFIG_SERIAL_OF_PLATFORM_NWPSERIAL is not set
 # CONFIG_HVC_UDBG is not set
@@ -1112,7 +1113,7 @@ CONFIG_MTD_PARTITIONS=y
 # CONFIG_MTD_RAM is not set
 CONFIG_MTD_REDBOOT_DIRECTORY_BLOCK=-1
 # CONFIG_MTD_REDBOOT_PARTS is not set
-CONFIG_MTD_REDBOOT_PARTS_READONLY=y
+# CONFIG_MTD_REDBOOT_PARTS_READONLY is not set
 # CONFIG_MTD_REDBOOT_PARTS_UNALLOCATED is not set
 # CONFIG_MTD_ROM is not set
 CONFIG_MTD_ROOTFS_ROOT_DEV=y
@@ -1631,6 +1632,8 @@ CONFIG_RWSEM_GENERIC_SPINLOCK=y
 # CONFIG_SATA_VITESSE is not set
 # CONFIG_SC92031 is not set
 # CONFIG_SCC is not set
+# CONFIG_SCHED_BFS is not set
+CONFIG_SCHED_CFS=y
 # CONFIG_SCHED_TRACER is not set
 # CONFIG_SCSI_3W_9XXX is not set
 # CONFIG_SCSI_7000FASST is not set
@@ -2173,6 +2176,7 @@ CONFIG_USB_HIDINPUT=y
 # CONFIG_USB_NET_CDC_SUBSET is not set
 # CONFIG_USB_NET_DM9601 is not set
 # CONFIG_USB_NET_GL620A is not set
+# CONFIG_USB_NET_INT51X1 is not set
 # CONFIG_USB_NET_MCS7830 is not set
 # CONFIG_USB_NET_NET1080 is not set
 # CONFIG_USB_NET_PLUSB is not set
@@ -2303,6 +2307,7 @@ CONFIG_USB_VIDEO_CLASS_INPUT_EVDEV=y
 # CONFIG_USB_WHCI_HCD is not set
 # CONFIG_USB_WUSB_CBAF is not set
 # CONFIG_USB_WUSB is not set
+# CONFIG_USB_XHCI_HCD is not set
 # CONFIG_USB_XPAD is not set
 # CONFIG_USB_XUSBATM is not set
 # CONFIG_USB_YEALINK is not set