aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/kirkwood
diff options
context:
space:
mode:
authorImre Kaloz <kaloz@openwrt.org>2009-06-03 13:42:28 +0000
committerImre Kaloz <kaloz@openwrt.org>2009-06-03 13:42:28 +0000
commit6b2a7b73ca8ba542fd2cbd21c615933b99e293ba (patch)
treebe1f22c1565b6e16079e8f09a60bc3899fc6b0a2 /target/linux/kirkwood
parent3d3d75a2489789df49a4985600f5cd5cb95dbaf8 (diff)
downloadupstream-6b2a7b73ca8ba542fd2cbd21c615933b99e293ba.tar.gz
upstream-6b2a7b73ca8ba542fd2cbd21c615933b99e293ba.tar.bz2
upstream-6b2a7b73ca8ba542fd2cbd21c615933b99e293ba.zip
upgrade to 2.6.30-rc8
SVN-Revision: 16307
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 c5004f7557..1e91b6ffde 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 af8e911e0d..c858d01a9a 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
}