[uml] 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 d3ce8b30b8f6303976d3518249e0a63024d3efeb..42bf07024e9f2a3ccb99b7d76da49abbb1112714 100644 (file)
--- 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 (file)
index 0000000..f4aba9b
--- /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