From 644807d7486779401fd1cdbb5b0aca3808e17ee6 Mon Sep 17 00:00:00 2001 From: Imre Kaloz Date: Mon, 23 Jun 2008 15:07:52 +0000 Subject: upgrade orion to 2.6.26-rc7 git-svn-id: svn://svn.openwrt.org/openwrt/trunk@11569 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- target/linux/orion/Makefile | 2 +- target/linux/orion/patches/060-mv643xx_git_backport.patch | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'target/linux/orion') 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 -- cgit v1.2.3