diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2014-05-23 12:05:38 +0200 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2014-05-23 12:05:38 +0200 |
| commit | 033e30653835c5c3fc785ab60e6a110203e6241d (patch) | |
| tree | fbb575df1204e3d44fd1262af721bae206fc848e /target/linux/patches/3.15-rc6/zlib-inflate.patch | |
| parent | 8f3142f161895b5fb02c12d1a4a6e5eec8e861d6 (diff) | |
resolve merge
Diffstat (limited to 'target/linux/patches/3.15-rc6/zlib-inflate.patch')
| -rw-r--r-- | target/linux/patches/3.15-rc6/zlib-inflate.patch | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/target/linux/patches/3.15-rc6/zlib-inflate.patch b/target/linux/patches/3.15-rc6/zlib-inflate.patch new file mode 100644 index 000000000..58e1f6d21 --- /dev/null +++ b/target/linux/patches/3.15-rc6/zlib-inflate.patch @@ -0,0 +1,12 @@ +diff -Nur linux-2.6.37.orig/lib/Kconfig linux-2.6.37/lib/Kconfig +--- linux-2.6.37.orig/lib/Kconfig 2011-01-05 01:50:19.000000000 +0100 ++++ linux-2.6.37/lib/Kconfig 2011-03-01 20:10:29.833370667 +0100 +@@ -95,7 +95,7 @@ + # compression support is select'ed if needed + # + config ZLIB_INFLATE +- tristate ++ boolean + + config ZLIB_DEFLATE + tristate |