aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/uml
diff options
context:
space:
mode:
authorGabor Juhos <juhosg@openwrt.org>2012-11-18 08:41:31 +0000
committerGabor Juhos <juhosg@openwrt.org>2012-11-18 08:41:31 +0000
commitff1e854511069a17b447c39fb38643f17a74df82 (patch)
tree163616bcfaf9da78e15fab87c672f35cba7e11fa /target/linux/uml
parent8f7ea44df09618615e7c505cd776add25a6c5b3a (diff)
downloadupstream-ff1e854511069a17b447c39fb38643f17a74df82.tar.gz
upstream-ff1e854511069a17b447c39fb38643f17a74df82.tar.bz2
upstream-ff1e854511069a17b447c39fb38643f17a74df82.zip
kernel: update linux 3.6 to 3.6.7
Signed-off-by: Gabor Juhos <juhosg@openwrt.org> SVN-Revision: 34227
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 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