From: Florian Fainelli <florian@openwrt.org>
Date: Sat, 17 Mar 2012 11:55:53 +0000 (+0000)
Subject: add support for 3.2
X-Git-Tag: reboot~14534
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=6e2c0fbe9fb68c610b2a062554bbcd94dc93961a;p=openwrt%2Fstaging%2Fjogo.git

add support for 3.2

SVN-Revision: 30961
---

diff --git a/target/linux/uml/config/x86_64 b/target/linux/uml/config/x86_64
index d3ce8b30b8..42bf07024e 100644
--- a/target/linux/uml/config/x86_64
+++ b/target/linux/uml/config/x86_64
@@ -17,8 +17,10 @@ CONFIG_CRAMFS=y
 CONFIG_CRC16=y
 # CONFIG_CRYPTO_AES_NI_INTEL is not set
 # CONFIG_CRYPTO_AES_X86_64 is not set
+# CONFIG_CRYPTO_BLOWFISH_X86_64 is not set
 # CONFIG_CRYPTO_SALSA20_X86_64 is not set
 # CONFIG_CRYPTO_TWOFISH_X86_64 is not set
+# CONFIG_CRYPTO_TWOFISH_X86_64_3WAY is not set
 CONFIG_DEBUG_BUGVERBOSE=y
 CONFIG_DEBUG_MEMORY_INIT=y
 CONFIG_DECOMPRESS_BZIP2=y
diff --git a/target/linux/uml/patches-3.2/901-lib_zlib_deflate_visible.patch b/target/linux/uml/patches-3.2/901-lib_zlib_deflate_visible.patch
new file mode 100644
index 0000000000..f4aba9bd7a
--- /dev/null
+++ b/target/linux/uml/patches-3.2/901-lib_zlib_deflate_visible.patch
@@ -0,0 +1,14 @@
+make ZLIB_DEFLATE visible, so that we can choose whether we want it built-in
+or as a module
+
+--- a/lib/Kconfig
++++ b/lib/Kconfig
+@@ -98,7 +98,7 @@ config ZLIB_INFLATE
+ 	tristate
+ 
+ config ZLIB_DEFLATE
+-	tristate
++	tristate "Zlib compression"
+ 
+ config LZO_COMPRESS
+ 	tristate