block2mtd: More 2.6.38 fixes

[openwrt.git] / target / linux / generic / config-2.6.32

diff --git a/target/linux/generic/config-2.6.32 b/target/linux/generic/config-2.6.32
index 0bb2b66..6439ef7 100644 (file)
--- a/target/linux/generic/config-2.6.32
+++ b/target/linux/generic/config-2.6.32
@@ -364,8 +364,8 @@ CONFIG_CRYPTO=y
 # CONFIG_CRYPTO_AEAD is not set
 # CONFIG_CRYPTO_AES is not set
 # CONFIG_CRYPTO_AES_586 is not set
 # CONFIG_CRYPTO_AEAD is not set
 # CONFIG_CRYPTO_AES is not set
 # CONFIG_CRYPTO_AES_586 is not set

-CONFIG_CRYPTO_ALGAPI=y
-CONFIG_CRYPTO_ALGAPI2=y
+# CONFIG_CRYPTO_ALGAPI is not set
+# CONFIG_CRYPTO_ALGAPI2 is not set

 # CONFIG_CRYPTO_ANSI_CPRNG is not set
 # CONFIG_CRYPTO_ANUBIS is not set
 # CONFIG_CRYPTO_ARC4 is not set
 # CONFIG_CRYPTO_ANSI_CPRNG is not set
 # CONFIG_CRYPTO_ANUBIS is not set
 # CONFIG_CRYPTO_ARC4 is not set


@@ -406,7 +406,8 @@ CONFIG_CRYPTO_MANAGER_NO_TESTS=y
 # CONFIG_CRYPTO_MICHAEL_MIC is not set
 # CONFIG_CRYPTO_NULL is not set
 # CONFIG_CRYPTO_PCBC is not set
 # 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
 # CONFIG_CRYPTO_PRNG is not set
 # CONFIG_CRYPTO_RMD128 is not set
 # CONFIG_CRYPTO_RMD160 is not set


@@ -427,12 +428,11 @@ 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_TWOFISH is not set
 # CONFIG_CRYPTO_TWOFISH_586 is not set
 # CONFIG_CRYPTO_TWOFISH_COMMON is not set

-CONFIG_CRYPTO_UNLZMA=y

 # CONFIG_CRYPTO_VMAC is not set
 # CONFIG_CRYPTO_WP512 is not set
 # CONFIG_CRYPTO_XCBC is not set
 # CONFIG_CRYPTO_XTS is not set
 # CONFIG_CRYPTO_VMAC is not set
 # 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
 # CONFIG_CUSE is not set
 # CONFIG_DAB is not set
 # CONFIG_DAVICOM_PHY is not set


@@ -857,12 +857,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_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
 CONFIG_INET=y
 # CONFIG_INET6_AH is not set
 # CONFIG_INET6_ESP is not set


@@ -1166,7 +1160,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_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
 # CONFIG_LEDS_TRIGGER_IDE_DISK is not set
 # CONFIG_LEDS_TRIGGER_MORSE is not set
 CONFIG_LEDS_TRIGGER_NETDEV=y


@@ -1456,10 +1450,10 @@ CONFIG_NETWORK_FILESYSTEMS=y
 # CONFIG_NET_ACT_PEDIT is not set
 # CONFIG_NET_ACT_POLICE is not set
 # CONFIG_NET_ACT_SIMP is not set
 # CONFIG_NET_ACT_PEDIT is not set
 # CONFIG_NET_ACT_POLICE is not set
 # CONFIG_NET_ACT_SIMP is not set

-CONFIG_NET_ACT_SKBEDIT=y
+# CONFIG_NET_ACT_SKBEDIT is not set

 CONFIG_NET_CLS=y
 CONFIG_NET_CLS=y

-CONFIG_NET_CLS_ACT=y
-CONFIG_NET_CLS_BASIC=y
+# CONFIG_NET_CLS_ACT is not set
+# CONFIG_NET_CLS_BASIC is not set

 # CONFIG_NET_CLS_FLOW is not set
 # CONFIG_NET_CLS_FW is not set
 CONFIG_NET_CLS_IND=y
 # CONFIG_NET_CLS_FLOW is not set
 # CONFIG_NET_CLS_FW is not set
 CONFIG_NET_CLS_IND=y


@@ -1789,7 +1783,7 @@ CONFIG_PRINTK=y
 # CONFIG_PRISM54 is not set
 # CONFIG_PROBE_INITRD_HEADER is not set
 CONFIG_PROC_FS=y
 # CONFIG_PRISM54 is not set
 # CONFIG_PROBE_INITRD_HEADER is not set
 CONFIG_PROC_FS=y

-CONFIG_PROC_KCORE=y
+# CONFIG_PROC_KCORE is not set

 # CONFIG_PROC_PAGE_MONITOR is not set
 CONFIG_PROC_SYSCTL=y
 # CONFIG_PROFILING is not set
 # CONFIG_PROC_PAGE_MONITOR is not set
 CONFIG_PROC_SYSCTL=y
 # CONFIG_PROFILING is not set


@@ -2343,8 +2337,8 @@ CONFIG_SWAP=y
 # CONFIG_SYNCLINK_CS is not set
 CONFIG_SYN_COOKIES=y
 CONFIG_SYSCTL=y
 # CONFIG_SYNCLINK_CS is not set
 CONFIG_SYN_COOKIES=y
 CONFIG_SYSCTL=y

-CONFIG_SYSCTL_SYSCALL=y
-CONFIG_SYSCTL_SYSCALL_CHECK=y
+# CONFIG_SYSCTL_SYSCALL is not set
+# CONFIG_SYSCTL_SYSCALL_CHECK is not set

 CONFIG_SYSFS=y
 # CONFIG_SYSFS_DEPRECATED is not set
 # CONFIG_SYSFS_DEPRECATED_V2 is not set
 CONFIG_SYSFS=y
 # CONFIG_SYSFS_DEPRECATED is not set
 # CONFIG_SYSFS_DEPRECATED_V2 is not set


@@ -2815,7 +2809,7 @@ CONFIG_WATCHDOG=y
 # CONFIG_WIMAX is not set
 CONFIG_WIRELESS=y
 CONFIG_WIRELESS_EXT=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=y
 CONFIG_WLAN_80211=y
 CONFIG_WIRELESS_OLD_REGULATORY=y
 CONFIG_WLAN=y
 CONFIG_WLAN_80211=y