aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/uml
diff options
context:
space:
mode:
authorJonas Gorski <jogo@openwrt.org>2012-04-24 09:25:38 +0000
committerJonas Gorski <jogo@openwrt.org>2012-04-24 09:25:38 +0000
commit281a545b076d2d956b64fb08b5f4a56648a1a9c0 (patch)
treef09bd5bf12ef5fb595d8b33351399b38947af701 /target/linux/uml
parent5520ed39bf434f53c6b47194f9907432a6daf97a (diff)
downloadupstream-281a545b076d2d956b64fb08b5f4a56648a1a9c0.tar.gz
upstream-281a545b076d2d956b64fb08b5f4a56648a1a9c0.tar.bz2
upstream-281a545b076d2d956b64fb08b5f4a56648a1a9c0.zip
kernel: update linux 3.3 to 3.3.3
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@31460 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.3/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 f516785b06..fd9f42ca25 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.3.2
+LINUX_VERSION:=3.3.3
include $(INCLUDE_DIR)/target.mk
diff --git a/target/linux/uml/patches-3.3/901-lib_zlib_deflate_visible.patch b/target/linux/uml/patches-3.3/901-lib_zlib_deflate_visible.patch
index f4aba9bd7a..f2b6547d58 100644
--- a/target/linux/uml/patches-3.3/901-lib_zlib_deflate_visible.patch
+++ b/target/linux/uml/patches-3.3/901-lib_zlib_deflate_visible.patch
@@ -3,7 +3,7 @@ or as a module
--- a/lib/Kconfig
+++ b/lib/Kconfig
-@@ -98,7 +98,7 @@ config ZLIB_INFLATE
+@@ -108,7 +108,7 @@ config ZLIB_INFLATE
tristate
config ZLIB_DEFLATE