summaryrefslogtreecommitdiffstats
path: root/target/linux/uml
diff options
context:
space:
mode:
authorjuhosg <juhosg@3c298f89-4303-0410-b956-a3cf2f4a3e73>2012-11-18 08:41:31 +0000
committerjuhosg <juhosg@3c298f89-4303-0410-b956-a3cf2f4a3e73>2012-11-18 08:41:31 +0000
commitb270e13375d156bec7241ac609db0cc9f7bd7cad (patch)
tree5944d950befc6e8fa54f52f81ab79305cc4b79f6 /target/linux/uml
parent777a1e41d482587d2d2a8ef622ff277df8423149 (diff)
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/Makefile2
-rw-r--r--target/linux/uml/patches-3.6/901-lib_zlib_deflate_visible.patch2
2 files changed, 2 insertions, 2 deletions
diff --git a/target/linux/uml/Makefile b/target/linux/uml/Makefile
index 6c7f93472..c473b781a 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 f2b6547d5..0c3eca177 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