don't use lzma/jffs2 on <2.6.33, set lzma/jffs2 as default for >=2.6.33. switch verbo...

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

diff --git a/target/linux/generic-2.6/config-2.6.34 b/target/linux/generic-2.6/config-2.6.34
index 03ed787..53cb190 100644 (file)
--- a/target/linux/generic-2.6/config-2.6.34
+++ b/target/linux/generic-2.6/config-2.6.34
@@ -669,6 +669,7 @@ CONFIG_GENERIC_TIME=y
 # CONFIG_GPIO_DEVICE is not set
 # CONFIG_GPIO_LANGWELL is not set
 # CONFIG_GPIOLIB is not set
+# CONFIG_GPIO_MAX7300 is not set
 # CONFIG_GPIO_MAX7301 is not set
 # CONFIG_GPIO_MAX732X is not set
 # CONFIG_GPIO_MC33880 is not set
@@ -782,6 +783,7 @@ CONFIG_HZ_100=y
 # CONFIG_I2C_DEBUG_BUS is not set
 # CONFIG_I2C_DEBUG_CHIP is not set
 # CONFIG_I2C_DEBUG_CORE is not set
+# CONFIG_I2C_DESIGNWARE is not set
 # CONFIG_I2C_ELEKTOR is not set
 # CONFIG_I2C_GPIO is not set
 # CONFIG_I2C_HELPER_AUTO is not set
@@ -803,12 +805,14 @@ CONFIG_HZ_100=y
 # CONFIG_I2C_SIS5595 is not set
 # CONFIG_I2C_SIS630 is not set
 # CONFIG_I2C_SIS96X is not set
+# CONFIG_I2C_SMBUS is not set
 # CONFIG_I2C_STUB is not set
 # CONFIG_I2C_TAOS_EVM is not set
 # CONFIG_I2C_TINY_USB is not set
 # CONFIG_I2C_VIA is not set
 # CONFIG_I2C_VIAPRO is not set
 # CONFIG_I2C_VOODOO3 is not set
+# CONFIG_I2C_XILINX is not set
 # CONFIG_I2O is not set
 # CONFIG_I82092 is not set
 # CONFIG_I82365 is not set
@@ -1106,7 +1110,8 @@ CONFIG_JFFS2_FS=y
 CONFIG_JFFS2_RTIME=y
 # CONFIG_JFFS2_RUBIN is not set
 CONFIG_JFFS2_SUMMARY=y
-CONFIG_JFFS2_ZLIB=y
+#CONFIG_JFFS2_ZLIB is not set
+CONFIG_JFFS2_LZMA=y
 # CONFIG_JFFS_FS is not set
 # CONFIG_JFS_DEBUG is not set
 # CONFIG_JFS_FS is not set
@@ -1198,6 +1203,7 @@ CONFIG_MAC80211_DEFAULT_PS=y
 # CONFIG_MACINTOSH_DRIVERS is not set
 # CONFIG_MAC_PARTITION is not set
 # CONFIG_MACVLAN is not set
+# CONFIG_MACVTAP is not set
 # CONFIG_MAGIC_SYSRQ is not set
 # CONFIG_MARKEINS is not set
 # CONFIG_MARKERS is not set
@@ -1226,6 +1232,7 @@ CONFIG_MAC80211_DEFAULT_PS=y
 # CONFIG_MFD_WM831X is not set
 # CONFIG_MFD_WM8350_I2C is not set
 # CONFIG_MFD_WM8400 is not set
+# CONFIG_MFD_WM8994 is not set
 # CONFIG_MG_DISK is not set
 # CONFIG_MIGRATION is not set
 CONFIG_MII=y
@@ -2024,6 +2031,7 @@ CONFIG_SELECT_MEMORY_MODEL=y
 # CONFIG_SENSORS_ADM1031 is not set
 # CONFIG_SENSORS_ADM9240 is not set
 # CONFIG_SENSORS_ADS7828 is not set
+# CONFIG_SENSORS_ADT7411 is not set
 # CONFIG_SENSORS_ADT7462 is not set
 # CONFIG_SENSORS_ADT7470 is not set
 # CONFIG_SENSORS_ADT7473 is not set
@@ -2031,6 +2039,7 @@ CONFIG_SELECT_MEMORY_MODEL=y
 # CONFIG_SENSORS_AMC6821 is not set
 # CONFIG_SENSORS_APPLESMC is not set
 # CONFIG_SENSORS_ASB100 is not set
+# CONFIG_SENSORS_ASC7621 is not set
 # CONFIG_SENSORS_ATK0110 is not set
 # CONFIG_SENSORS_ATXP1 is not set
 # CONFIG_SENSORS_CORETEMP is not set
@@ -2765,6 +2774,7 @@ CONFIG_USB_VIDEO_CLASS_INPUT_EVDEV=y
 # CONFIG_VIDEO_TVAUDIO is not set
 # CONFIG_VIDEO_TVP514X is not set
 # CONFIG_VIDEO_TVP5150 is not set
+# CONFIG_VIDEO_TVP7002 is not set
 # CONFIG_VIDEO_UPD64031A is not set
 # CONFIG_VIDEO_UPD64083 is not set
 # CONFIG_VIDEO_USBVISION is not set