diff options
| author | Imre Kaloz <kaloz@openwrt.org> | 2008-06-13 12:12:34 +0000 |
|---|---|---|
| committer | Imre Kaloz <kaloz@openwrt.org> | 2008-06-13 12:12:34 +0000 |
| commit | 354d78404ab32ee417c9577a4612ec659f8374d9 (patch) | |
| tree | c21f5fe2b13353a1cb861b538e849eda7bcf525e /target/linux | |
| parent | 7c029b03555b5ff59255dbc30a0bfa5299b209a1 (diff) | |
| download | upstream-354d78404ab32ee417c9577a4612ec659f8374d9.tar.gz upstream-354d78404ab32ee417c9577a4612ec659f8374d9.tar.bz2 upstream-354d78404ab32ee417c9577a4612ec659f8374d9.zip | |
upgrade orion and sync to 2.6.26-rc6
SVN-Revision: 11456
Diffstat (limited to 'target/linux')
| -rw-r--r-- | target/linux/generic-2.6/patches-2.6.26/900-headers_type_and_time.patch | 2 | ||||
| -rw-r--r-- | target/linux/orion/Makefile | 2 |
2 files changed, 2 insertions, 2 deletions
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 |