summaryrefslogtreecommitdiffstats
path: root/target/linux/kirkwood
diff options
context:
space:
mode:
authorkaloz <kaloz@3c298f89-4303-0410-b956-a3cf2f4a3e73>2009-06-03 13:42:28 +0000
committerkaloz <kaloz@3c298f89-4303-0410-b956-a3cf2f4a3e73>2009-06-03 13:42:28 +0000
commit7d01bddd188fbc4bed66f137c1a1ddda572f234d (patch)
tree29e1a62037306f13deffcc1f44e8d5a99a46a225 /target/linux/kirkwood
parent9592a6ef10e1c457cf92719cf8ad13545b172543 (diff)
upgrade to 2.6.30-rc8
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@16307 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/kirkwood')
-rw-r--r--target/linux/kirkwood/Makefile2
-rw-r--r--target/linux/kirkwood/patches/003-gating.patch2
2 files changed, 2 insertions, 2 deletions
diff --git a/target/linux/kirkwood/Makefile b/target/linux/kirkwood/Makefile
index c5004f755..1e91b6ffd 100644
--- a/target/linux/kirkwood/Makefile
+++ b/target/linux/kirkwood/Makefile
@@ -11,7 +11,7 @@ BOARD:=kirkwood
BOARDNAME:=Marvell Kirkwood
FEATURES:=tgz usb
-LINUX_VERSION:=2.6.30-rc7
+LINUX_VERSION:=2.6.30-rc8
include $(INCLUDE_DIR)/target.mk
diff --git a/target/linux/kirkwood/patches/003-gating.patch b/target/linux/kirkwood/patches/003-gating.patch
index af8e911e0..c858d01a9 100644
--- a/target/linux/kirkwood/patches/003-gating.patch
+++ b/target/linux/kirkwood/patches/003-gating.patch
@@ -16,7 +16,7 @@ Signed-off-by: Rabeeh Khoury <rabeeh@marvell.com>
--- a/arch/arm/mach-kirkwood/common.c
+++ b/arch/arm/mach-kirkwood/common.c
-@@ -788,6 +788,38 @@ static void __init kirkwood_l2_init(void
+@@ -786,6 +786,38 @@ static void __init kirkwood_l2_init(void
#endif
}