aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/uml
diff options
context:
space:
mode:
authorFlorian Fainelli <florian@openwrt.org>2012-03-17 11:55:53 +0000
committerFlorian Fainelli <florian@openwrt.org>2012-03-17 11:55:53 +0000
commit6e2c0fbe9fb68c610b2a062554bbcd94dc93961a (patch)
tree93beddb6d1a52ea048a7b93e99c14cf2859cd3eb /target/linux/uml
parent9ef8de0e0ae2f176e13f6f3cca8926b3a2fa6df5 (diff)
downloadupstream-6e2c0fbe9fb68c610b2a062554bbcd94dc93961a.tar.gz
upstream-6e2c0fbe9fb68c610b2a062554bbcd94dc93961a.tar.bz2
upstream-6e2c0fbe9fb68c610b2a062554bbcd94dc93961a.zip
add support for 3.2
SVN-Revision: 30961
Diffstat (limited to 'target/linux/uml')
-rw-r--r--target/linux/uml/config/x86_642
-rw-r--r--target/linux/uml/patches-3.2/901-lib_zlib_deflate_visible.patch14
2 files changed, 16 insertions, 0 deletions
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