diff options
author | Imre Kaloz <kaloz@openwrt.org> | 2008-06-23 15:07:52 +0000 |
---|---|---|
committer | Imre Kaloz <kaloz@openwrt.org> | 2008-06-23 15:07:52 +0000 |
commit | 81af6da03766b83a47347e7509fd6e6829ac8569 (patch) | |
tree | 8ec6ec879c61ac178deef48a3fc4ea85cee90cc9 /target/linux/orion | |
parent | 5eda098fa7e0db84205b62d6c60486c598d77632 (diff) | |
download | upstream-81af6da03766b83a47347e7509fd6e6829ac8569.tar.gz upstream-81af6da03766b83a47347e7509fd6e6829ac8569.tar.bz2 upstream-81af6da03766b83a47347e7509fd6e6829ac8569.zip |
upgrade orion to 2.6.26-rc7
SVN-Revision: 11569
Diffstat (limited to 'target/linux/orion')
-rw-r--r-- | target/linux/orion/Makefile | 2 | ||||
-rw-r--r-- | target/linux/orion/patches/060-mv643xx_git_backport.patch | 2 |
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 |