[kernel] generic-2.6/2.6.28: refresh patches

[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 3e1a65c..20e6eeb 100644 (file)
--- a/target/linux/generic-2.6/config-2.6.30
+++ b/target/linux/generic-2.6/config-2.6.30
@@ -304,10 +304,6 @@ CONFIG_CMDLINE=""
 # CONFIG_CODA_FS is not set
 # CONFIG_COMPAT_BRK is not set
 CONFIG_COMPAT_NET_DEV_OPS=y
-# CONFIG_CRYPTO_AES_586 is not set
-# CONFIG_CRYPTO_CRC32C_INTEL is not set
-# CONFIG_CRYPTO_SALSA20_586 is not set
-# CONFIG_CRYPTO_TWOFISH_586 is not set
 # CONFIG_CONFIGFS_FS is not set
 # CONFIG_CONNECTOR is not set
 # CONFIG_CONTEXT_SWITCH_TRACER is not set
@@ -324,9 +320,10 @@ CONFIG_CRC32=y
 CONFIG_CROSSCOMPILE=y
 CONFIG_CRYPTO_AEAD2=m
 # CONFIG_CRYPTO_AEAD is not set
+# CONFIG_CRYPTO_AES_586 is not set
 CONFIG_CRYPTO_AES=m
-CONFIG_CRYPTO_ALGAPI2=m
-CONFIG_CRYPTO_ALGAPI=m
+CONFIG_CRYPTO_ALGAPI2=y
+CONFIG_CRYPTO_ALGAPI=y
 # CONFIG_CRYPTO_ANSI_CPRNG is not set
 # CONFIG_CRYPTO_ANUBIS is not set
 CONFIG_CRYPTO_ARC4=m
@@ -339,6 +336,7 @@ CONFIG_CRYPTO_BLKCIPHER=m
 # CONFIG_CRYPTO_CAST6 is not set
 # CONFIG_CRYPTO_CBC is not set
 # CONFIG_CRYPTO_CCM is not set
+# CONFIG_CRYPTO_CRC32C_INTEL is not set
 # CONFIG_CRYPTO_CRC32C is not set
 # CONFIG_CRYPTO_CRYPTD is not set
 # CONFIG_CRYPTO_CTR is not set
@@ -365,7 +363,7 @@ CONFIG_CRYPTO_MANAGER=m
 # CONFIG_CRYPTO_MICHAEL_MIC is not set
 # CONFIG_CRYPTO_NULL is not set
 # CONFIG_CRYPTO_PCBC is not set
-CONFIG_CRYPTO_PCOMP=m
+CONFIG_CRYPTO_PCOMP=y
 # CONFIG_CRYPTO_PRNG is not set
 # CONFIG_CRYPTO_RMD128 is not set
 # CONFIG_CRYPTO_RMD160 is not set
@@ -373,6 +371,7 @@ CONFIG_CRYPTO_PCOMP=m
 # CONFIG_CRYPTO_RMD320 is not set
 CONFIG_CRYPTO_RNG2=m
 # CONFIG_CRYPTO_RNG is not set
+# CONFIG_CRYPTO_SALSA20_586 is not set
 # CONFIG_CRYPTO_SALSA20 is not set
 # CONFIG_CRYPTO_SEED is not set
 # CONFIG_CRYPTO_SEQIV is not set
@@ -383,14 +382,16 @@ CONFIG_CRYPTO_RNG2=m
 # CONFIG_CRYPTO_TEA is not set
 # CONFIG_CRYPTO_TEST is not set
 # CONFIG_CRYPTO_TGR192 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_UNLZMA=y
 CONFIG_CRYPTO_WORKQUEUE=m
 # CONFIG_CRYPTO_WP512 is not set
 # CONFIG_CRYPTO_XCBC is not set
 # CONFIG_CRYPTO_XTS is not set
 CONFIG_CRYPTO=y
-# CONFIG_CRYPTO_ZLIB is not set
+CONFIG_CRYPTO_ZLIB=y
 # CONFIG_DAB is not set
 # CONFIG_DAVICOM_PHY is not set
 # CONFIG_DCB is not set
@@ -487,6 +488,7 @@ CONFIG_FLATMEM=y
 CONFIG_FLAT_NODE_MEM_MAP=y
 # CONFIG_FORCEDETH is not set
 CONFIG_FRAME_WARN=1024
+# CONFIG_FREEZER is not set
 # CONFIG_FSCACHE is not set
 # CONFIG_FS_POSIX_ACL is not set
 # CONFIG_FTL is not set
@@ -522,6 +524,7 @@ CONFIG_GENERIC_TIME=y
 # CONFIG_HAMACHI is not set
 CONFIG_HAMRADIO=y
 # CONFIG_HAPPYMEAL is not set
+# CONFIG_HAVE_AOUT is not set
 # CONFIG_HDLC_CISCO is not set
 # CONFIG_HDLC_FR is not set
 # CONFIG_HDLC is not set
@@ -914,7 +917,7 @@ CONFIG_JOLIET=y
 # CONFIG_KEXEC is not set
 # CONFIG_KEYS is not set
 # CONFIG_KMEMTRACE is not set
-# CONFIG_KMOD is not set
+CONFIG_KMOD=y
 # CONFIG_KPROBES is not set
 # CONFIG_LANMEDIA is not set
 # CONFIG_LAPB is not set
@@ -1276,6 +1279,7 @@ CONFIG_NF_CONNTRACK_SUPPORT=y
 # CONFIG_NF_CT_PROTO_GRE is not set
 # CONFIG_NF_CT_PROTO_SCTP is not set
 # CONFIG_NF_CT_PROTO_UDPLITE is not set
+# CONFIG_NF_DEFRAG_IPV4 is not set
 # CONFIG_NF_NAT_AMANDA is not set
 # CONFIG_NF_NAT_FTP is not set
 # CONFIG_NF_NAT_H323 is not set
@@ -1304,6 +1308,7 @@ CONFIG_NFS_V4=y
 # CONFIG_NFTL is not set
 # CONFIG_NILFS2_FS is not set
 CONFIG_NL80211=y
+CONFIG_NLATTR=y
 # CONFIG_NLS_ASCII is not set
 # CONFIG_NLS_CODEPAGE_1250 is not set
 # CONFIG_NLS_CODEPAGE_1251 is not set
@@ -1367,6 +1372,11 @@ CONFIG_NLS_DEFAULT="iso8859-1"
 # CONFIG_P54_COMMON is not set
 CONFIG_PACKET_MMAP=y
 CONFIG_PACKET=y
+# CONFIG_PAGE_SIZE_16KB is not set
+# CONFIG_PAGE_SIZE_32KB is not set
+CONFIG_PAGE_SIZE_4KB=y
+# CONFIG_PAGE_SIZE_64KB is not set
+# CONFIG_PAGE_SIZE_8KB is not set
 # CONFIG_PANTHERLORD_FF is not set
 # CONFIG_PARPORT is not set
 # CONFIG_PARPORT_PC is not set
@@ -1450,6 +1460,7 @@ CONFIG_PCI_QUIRKS=y
 # CONFIG_PHONE is not set
 # CONFIG_PHONET is not set
 # CONFIG_PHYLIB is not set
+# CONFIG_PHYS_ADDR_T_64BIT is not set
 # CONFIG_PID_NS is not set
 CONFIG_PLIST=y
 # CONFIG_PLX_HERMES is not set
@@ -1931,14 +1942,18 @@ CONFIG_SND_VERBOSE_PROCFS=y
 # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set
 # CONFIG_SPI_AT25 is not set
 # CONFIG_SPI_DEBUG is not set
+# CONFIG_SPI_GPIO_OLD is not set
 # CONFIG_SPI is not set
 # CONFIG_SPI_MASTER is not set
 # CONFIG_SPI_TLE62X0 is not set
 CONFIG_SPLIT_PTLOCK_CPUS=4
 # CONFIG_SQUASHFS_EMBEDDED is not set
 CONFIG_SQUASHFS_FRAGMENT_CACHE_SIZE=3
+CONFIG_SQUASHFS_SUPPORT_LZMA=y
+CONFIG_SQUASHFS_SUPPORT_ZLIB=y
 # CONFIG_SQUASHFS_VMALLOC is not set
 CONFIG_SQUASHFS=y
+# CONFIG_SSB_BLOCKIO is not set
 # CONFIG_SSB_DEBUG is not set
 # CONFIG_SSB is not set
 # CONFIG_SSB_PCMCIAHOST is not set