From: Imre Kaloz <kaloz@openwrt.org>
Date: Fri, 13 Jun 2008 12:12:34 +0000 (+0000)
Subject: upgrade orion and sync to 2.6.26-rc6
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=354d78404ab32ee417c9577a4612ec659f8374d9;p=openwrt%2Fstaging%2Fjow.git

upgrade orion and sync to 2.6.26-rc6

SVN-Revision: 11456
---

diff --git a/target/linux/generic-2.6/patches-2.6.26/900-headers_type_and_time.patch b/target/linux/generic-2.6/patches-2.6.26/900-headers_type_and_time.patch
index b15fd56a9d..b318c90606 100644
--- a/target/linux/generic-2.6/patches-2.6.26/900-headers_type_and_time.patch
+++ b/target/linux/generic-2.6/patches-2.6.26/900-headers_type_and_time.patch
@@ -11,7 +11,7 @@
  #include <linux/types.h>
  
  #ifdef __KERNEL__
-@@ -232,4 +236,6 @@
+@@ -228,4 +232,6 @@
   */
  #define TIMER_ABSTIME			0x01
  
diff --git a/target/linux/orion/Makefile b/target/linux/orion/Makefile
index ff4dd8011e..f2293b8f14 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-rc5
+LINUX_VERSION:=2.6.26-rc6
 
 include $(INCLUDE_DIR)/target.mk