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 b15fd56a9dd8ba81ce61db5862f98f0576617c01..b318c906069013ba556c14477563fdcac4055bac 100644 (file)
--- 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 ff4dd8011e2779b608088cb508ab326abf00c3cc..f2293b8f1406faca7c90350ae2d1b4872d6e0ae1 100644 (file)
--- 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