X-Git-Url: http://git.openwrt.org/?p=openwrt%2Fsvn-archive%2Farchive.git;a=blobdiff_plain;f=target%2Flinux%2Fgeneric%2Fconfig-2.6.31;h=3678aa570b6210d2194933ee7fae8413f4af464f;hp=8bf29fe2c0b469831ee7cd22329f691f67642274;hb=a1250e4ec57db003171bb71eace1753cd161e5a6;hpb=446c318fa4cf26ca3229748fca6c2b7234ae3cc6

diff --git a/target/linux/generic/config-2.6.31 b/target/linux/generic/config-2.6.31
index 8bf29fe2c0..3678aa570b 100644
--- a/target/linux/generic/config-2.6.31
+++ b/target/linux/generic/config-2.6.31
@@ -394,7 +394,8 @@ CONFIG_CRYPTO_ALGAPI2=y
 # CONFIG_CRYPTO_MICHAEL_MIC is not set
 # CONFIG_CRYPTO_NULL is not set
 # CONFIG_CRYPTO_PCBC is not set
-CONFIG_CRYPTO_PCOMP=y
+# CONFIG_CRYPTO_PCOMP is not set
+# CONFIG_CRYPTO_PCOMP2 is not set
 # CONFIG_CRYPTO_PRNG is not set
 # CONFIG_CRYPTO_RMD128 is not set
 # CONFIG_CRYPTO_RMD160 is not set
@@ -415,11 +416,10 @@ CONFIG_CRYPTO_PCOMP=y
 # CONFIG_CRYPTO_TWOFISH is not set
 # CONFIG_CRYPTO_TWOFISH_586 is not set
 # CONFIG_CRYPTO_TWOFISH_COMMON is not set
-CONFIG_CRYPTO_UNLZMA=y
 # CONFIG_CRYPTO_WP512 is not set
 # CONFIG_CRYPTO_XCBC is not set
 # CONFIG_CRYPTO_XTS is not set
-CONFIG_CRYPTO_ZLIB=y
+# CONFIG_CRYPTO_ZLIB is not set
 # CONFIG_CUSE is not set
 # CONFIG_DAB is not set
 # CONFIG_DAVICOM_PHY is not set
@@ -428,6 +428,9 @@ CONFIG_CRYPTO_ZLIB=y
 CONFIG_DEBUG_FS=y
 # CONFIG_DEBUG_KERNEL is not set
 # CONFIG_DEBUG_MEMORY_INIT is not set
+# CONFIG_DEBUG_PAGEALLOC is not set
+# CONFIG_DEBUG_RODATA is not set
+# CONFIG_DEBUG_STACKOVERFLOW is not set
 # CONFIG_DECNET is not set
 CONFIG_DECOMPRESS_LZMA_NEEDED=y
 # CONFIG_DEFAULT_AS is not set
@@ -502,8 +505,11 @@ CONFIG_EXPERIMENTAL=y
 # CONFIG_EXT3_DEFAULTS_TO_ORDERED is not set
 # CONFIG_EXT3_FS is not set
 # CONFIG_EXT3_FS_XATTR is not set
+# CONFIG_EXT4DEV_COMPAT is not set
 # CONFIG_EXT4DEV_FS is not set
 # CONFIG_EXT4_FS is not set
+# CONFIG_EXT4_FS_SECURITY is not set
+# CONFIG_EXT4_FS_XATTR is not set
 CONFIG_EXTRA_FIRMWARE=""
 CONFIG_EXTRA_TARGETS=""
 # CONFIG_EZX_PCAP is not set
@@ -793,12 +799,6 @@ CONFIG_IDE_PROC_FS=y
 # CONFIG_IKCONFIG is not set
 # CONFIG_IKCONFIG_PROC is not set
 # CONFIG_IMAGE_CMDLINE_HACK is not set
-# CONFIG_IMQ is not set
-# CONFIG_IMQ_BEHAVIOR_AA is not set
-# CONFIG_IMQ_BEHAVIOR_AB is not set
-# CONFIG_IMQ_BEHAVIOR_BA is not set
-# CONFIG_IMQ_BEHAVIOR_BB is not set
-CONFIG_IMQ_NUM_DEVS=2
 CONFIG_INET=y
 # CONFIG_INET6_AH is not set
 # CONFIG_INET6_ESP is not set
@@ -1055,8 +1055,20 @@ CONFIG_JOLIET=y
 CONFIG_KERNEL_LZMA=y
 # CONFIG_KERNEL_LZO is not set
 # CONFIG_KEXEC is not set
+# CONFIG_KEYBOARD_ADP5588 is not set
+# CONFIG_KEYBOARD_ATKBD is not set
+# CONFIG_KEYBOARD_LKKBD is not set
 # CONFIG_KEYBOARD_LM8323 is not set
+# CONFIG_KEYBOARD_MATRIX is not set
+# CONFIG_KEYBOARD_MAX7359 is not set
+# CONFIG_KEYBOARD_MCS is not set
+# CONFIG_KEYBOARD_NEWTON is not set
+# CONFIG_KEYBOARD_OPENCORES is not set
+# CONFIG_KEYBOARD_STOWAWAY is not set
+# CONFIG_KEYBOARD_SUNKBD is not set
+# CONFIG_KEYBOARD_XTKBD is not set
 # CONFIG_KEYS is not set
+# CONFIG_KMEMCHECK is not set
 # CONFIG_KMEMTRACE is not set
 CONFIG_KMOD=y
 # CONFIG_KPROBES is not set
@@ -1084,7 +1096,7 @@ CONFIG_LEDS_TRIGGERS=y
 # CONFIG_LEDS_TRIGGER_BACKLIGHT is not set
 CONFIG_LEDS_TRIGGER_DEFAULT_ON=y
 # CONFIG_LEDS_TRIGGER_GPIO is not set
-CONFIG_LEDS_TRIGGER_HEARTBEAT=y
+# CONFIG_LEDS_TRIGGER_HEARTBEAT is not set
 # CONFIG_LEDS_TRIGGER_IDE_DISK is not set
 # CONFIG_LEDS_TRIGGER_MORSE is not set
 CONFIG_LEDS_TRIGGER_NETDEV=y
@@ -2669,7 +2681,7 @@ CONFIG_WATCHDOG=y
 # CONFIG_WIMAX is not set
 CONFIG_WIRELESS=y
 CONFIG_WIRELESS_EXT=y
-CONFIG_WIRELESS_EXT_SYSFS=y
+# CONFIG_WIRELESS_EXT_SYSFS is not set
 CONFIG_WIRELESS_OLD_REGULATORY=y
 CONFIG_WLAN_80211=y
 # CONFIG_WLAN_PRE80211 is not set