diff options
| author | Gabor Juhos <juhosg@openwrt.org> | 2012-11-18 08:41:31 +0000 |
|---|---|---|
| committer | Gabor Juhos <juhosg@openwrt.org> | 2012-11-18 08:41:31 +0000 |
| commit | a0e5999983362e1815082f1ca3176dbaff95bf99 (patch) | |
| tree | 5944d950befc6e8fa54f52f81ab79305cc4b79f6 /target/linux/uml | |
| parent | effd4b76ec17b9597b10b17fbec80df568cf66a9 (diff) | |
| download | upstream-a0e5999983362e1815082f1ca3176dbaff95bf99.tar.gz upstream-a0e5999983362e1815082f1ca3176dbaff95bf99.tar.bz2 upstream-a0e5999983362e1815082f1ca3176dbaff95bf99.zip | |
kernel: update linux 3.6 to 3.6.7
Signed-off-by: Gabor Juhos <juhosg@openwrt.org>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@34227 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/uml')
| -rw-r--r-- | target/linux/uml/Makefile | 2 | ||||
| -rw-r--r-- | target/linux/uml/patches-3.6/901-lib_zlib_deflate_visible.patch | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/target/linux/uml/Makefile b/target/linux/uml/Makefile index 6c7f934728..c473b781ad 100644 --- a/target/linux/uml/Makefile +++ b/target/linux/uml/Makefile @@ -23,7 +23,7 @@ BOARDNAME:=User Mode Linux FEATURES:=ext4 audio MAINTAINER:=Florian Fainelli <florian@openwrt.org> -LINUX_VERSION:=3.6.6 +LINUX_VERSION:=3.6.7 include $(INCLUDE_DIR)/target.mk diff --git a/target/linux/uml/patches-3.6/901-lib_zlib_deflate_visible.patch b/target/linux/uml/patches-3.6/901-lib_zlib_deflate_visible.patch index f2b6547d58..0c3eca1775 100644 --- a/target/linux/uml/patches-3.6/901-lib_zlib_deflate_visible.patch +++ b/target/linux/uml/patches-3.6/901-lib_zlib_deflate_visible.patch @@ -3,7 +3,7 @@ or as a module --- a/lib/Kconfig +++ b/lib/Kconfig -@@ -108,7 +108,7 @@ config ZLIB_INFLATE +@@ -178,7 +178,7 @@ config ZLIB_INFLATE tristate config ZLIB_DEFLATE |