aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/uml
diff options
context:
space:
mode:
authorJonas Gorski <jogo@openwrt.org>2011-12-06 19:50:25 +0000
committerJonas Gorski <jogo@openwrt.org>2011-12-06 19:50:25 +0000
commit6e2ae90f4ab5f90459da923069ed31dc6503918f (patch)
tree026bf14dff23d3be81dbb4c44a6de598fa2d8f8e /target/linux/uml
parentc6b2b98812447c4c1dac9d83ccd01a6d3ba448c4 (diff)
downloadupstream-6e2ae90f4ab5f90459da923069ed31dc6503918f.tar.gz
upstream-6e2ae90f4ab5f90459da923069ed31dc6503918f.tar.bz2
upstream-6e2ae90f4ab5f90459da923069ed31dc6503918f.zip
linux: update 3.0 to 3.0.12
SVN-Revision: 29469
Diffstat (limited to 'target/linux/uml')
-rw-r--r--target/linux/uml/Makefile2
-rw-r--r--target/linux/uml/patches-3.0/004-fix_atomic64_32.patch2
2 files changed, 2 insertions, 2 deletions
diff --git a/target/linux/uml/Makefile b/target/linux/uml/Makefile
index f6c4586e28..244d8339d6 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.0.9
+LINUX_VERSION:=3.0.12
include $(INCLUDE_DIR)/target.mk
diff --git a/target/linux/uml/patches-3.0/004-fix_atomic64_32.patch b/target/linux/uml/patches-3.0/004-fix_atomic64_32.patch
index 6901eee210..fe1e48fc42 100644
--- a/target/linux/uml/patches-3.0/004-fix_atomic64_32.patch
+++ b/target/linux/uml/patches-3.0/004-fix_atomic64_32.patch
@@ -2,7 +2,7 @@
--- a/arch/um/sys-i386/Makefile
+++ b/arch/um/sys-i386/Makefile
-@@ -8,7 +8,7 @@ obj-y = bug.o bugs.o checksum.o delay.o
+@@ -8,7 +8,7 @@ obj-y = bug.o bugs.o checksum.o delay.o
obj-$(CONFIG_BINFMT_ELF) += elfcore.o