summaryrefslogtreecommitdiffstats
path: root/target/linux/uml
diff options
context:
space:
mode:
authorjogo <jogo@3c298f89-4303-0410-b956-a3cf2f4a3e73>2011-12-06 19:50:25 +0000
committerjogo <jogo@3c298f89-4303-0410-b956-a3cf2f4a3e73>2011-12-06 19:50:25 +0000
commit9556c473485ff6d7e0ba0a29beaccc3d696c20e1 (patch)
tree7bba1b0999a440763c10bb2473496354a006a291 /target/linux/uml
parent56124f8782dc860744a01384621d6456cd744109 (diff)
linux: update 3.0 to 3.0.12
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@29469 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.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 f6c4586e2..244d8339d 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 6901eee21..fe1e48fc4 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