merge missing updates to squashfs lzma support from 2.6.30 to 2.6.31

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

diff --git a/target/linux/generic-2.6/config-2.6.30 b/target/linux/generic-2.6/config-2.6.30
index eb47439..bdd84cd 100644 (file)
--- a/target/linux/generic-2.6/config-2.6.30
+++ b/target/linux/generic-2.6/config-2.6.30
@@ -1100,7 +1100,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
@@ -1618,6 +1618,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
@@ -2098,6 +2100,31 @@ CONFIG_USB_EZUSB=y
 # CONFIG_USB_GADGET is not set
 # CONFIG_USB_GPIO_VBUS is not set
 # CONFIG_USB_GSPCA is not set
+# CONFIG_USB_GSPCA_CONEX is not set
+# CONFIG_USB_GSPCA_ETOMS is not set
+# CONFIG_USB_GSPCA_FINEPIX is not set
+# CONFIG_USB_GSPCA_MARS is not set
+# CONFIG_USB_GSPCA_MR97310A is not set
+# CONFIG_USB_GSPCA_OV519 is not set
+# CONFIG_USB_GSPCA_OV534 is not set
+# CONFIG_USB_GSPCA_PAC207 is not set
+# CONFIG_USB_GSPCA_PAC7311 is not set
+# CONFIG_USB_GSPCA_SONIXB is not set
+# CONFIG_USB_GSPCA_SONIXJ is not set
+# CONFIG_USB_GSPCA_SPCA500 is not set
+# CONFIG_USB_GSPCA_SPCA501 is not set
+# CONFIG_USB_GSPCA_SPCA505 is not set
+# CONFIG_USB_GSPCA_SPCA506 is not set
+# CONFIG_USB_GSPCA_SPCA508 is not set
+# CONFIG_USB_GSPCA_SPCA561 is not set
+# CONFIG_USB_GSPCA_SQ905 is not set
+# CONFIG_USB_GSPCA_SQ905C is not set
+# CONFIG_USB_GSPCA_STK014 is not set
+# CONFIG_USB_GSPCA_SUNPLUS is not set
+# CONFIG_USB_GSPCA_T613 is not set
+# CONFIG_USB_GSPCA_TV8532 is not set
+# CONFIG_USB_GSPCA_VC032X is not set
+# CONFIG_USB_GSPCA_ZC3XX is not set
 # CONFIG_USB_HIDDEV is not set
 # CONFIG_USB_HIDINPUT_POWERBOOK is not set
 CONFIG_USB_HIDINPUT=y
@@ -2122,6 +2149,7 @@ CONFIG_USB_HIDINPUT=y
 # CONFIG_USB_LED is not set
 # CONFIG_USB_LEGOTOWER is not set
 # CONFIG_USB_LIBUSUAL is not set
+# CONFIG_USB_M5602 is not set
 # CONFIG_USB_MDC800 is not set
 # CONFIG_USB_MICROTEK is not set
 # CONFIG_USB_MON is not set
@@ -2242,6 +2270,7 @@ CONFIG_USB_STORAGE_SDDR09=y
 CONFIG_USB_STORAGE_SDDR55=y
 # CONFIG_USB_STORAGE_SIERRA is not set
 CONFIG_USB_STORAGE_USBAT=y
+# CONFIG_USB_STV06XX is not set
 # CONFIG_USB_STV680 is not set
 # CONFIG_USB_SUPPORT is not set
 # CONFIG_USB_TEST is not set
@@ -2253,6 +2282,7 @@ CONFIG_USB_STORAGE_USBAT=y
 # CONFIG_USB_USBNET_MII is not set
 # CONFIG_USB_VICAM is not set
 # CONFIG_USB_VIDEO_CLASS is not set
+CONFIG_USB_VIDEO_CLASS_INPUT_EVDEV=y
 # CONFIG_USB_VST is not set
 # CONFIG_USB_W9968CF is not set
 # CONFIG_USB_WACOM is not set