summaryrefslogtreecommitdiff
path: root/target/linux/orion
diff options
context:
space:
mode:
authorkaloz <kaloz@3c298f89-4303-0410-b956-a3cf2f4a3e73>2008-06-23 15:07:52 +0000
committerkaloz <kaloz@3c298f89-4303-0410-b956-a3cf2f4a3e73>2008-06-23 15:07:52 +0000
commit9f4462d8018a0fb81250ca682a78480d3e0edf3d (patch)
tree5bfb55781f9d647310e398c4775bfd64571c778b /target/linux/orion
parent2c5ae4070b8e0b9cc15ea83a8ad86c7d6f21b289 (diff)
upgrade orion to 2.6.26-rc7
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@11569 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/orion')
-rw-r--r--target/linux/orion/Makefile2
-rw-r--r--target/linux/orion/patches/060-mv643xx_git_backport.patch2
2 files changed, 2 insertions, 2 deletions
diff --git a/target/linux/orion/Makefile b/target/linux/orion/Makefile
index 8b18cccb17..22584e006e 100644
--- a/target/linux/orion/Makefile
+++ b/target/linux/orion/Makefile
@@ -11,7 +11,7 @@ BOARD:=orion
BOARDNAME:=Marvell Orion
FEATURES:=squashfs
-LINUX_VERSION:=2.6.26-rc6
+LINUX_VERSION:=2.6.26-rc7
include $(INCLUDE_DIR)/target.mk
diff --git a/target/linux/orion/patches/060-mv643xx_git_backport.patch b/target/linux/orion/patches/060-mv643xx_git_backport.patch
index 0b039224d5..76eaddd496 100644
--- a/target/linux/orion/patches/060-mv643xx_git_backport.patch
+++ b/target/linux/orion/patches/060-mv643xx_git_backport.patch
@@ -5327,7 +5327,7 @@
+#endif
--- a/MAINTAINERS
+++ b/MAINTAINERS
-@@ -2689,12 +2689,10 @@
+@@ -2690,12 +2690,10 @@
S: Maintained
MARVELL MV643XX ETHERNET DRIVER