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 | 91aa7be62469dae67dfeb8cd69dba2df6752ab2e (patch) | |
| tree | e9a9e872ffde0d71cafb0c5b8938fe60cd53a18b | |
| parent | 8697eb89936476947be5e06a3e0fbade72bc8161 (diff) | |
| download | upstream-91aa7be62469dae67dfeb8cd69dba2df6752ab2e.tar.gz upstream-91aa7be62469dae67dfeb8cd69dba2df6752ab2e.tar.bz2 upstream-91aa7be62469dae67dfeb8cd69dba2df6752ab2e.zip | |
upgrade orion and sync to 2.6.26-rc6
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@11456 3c298f89-4303-0410-b956-a3cf2f4a3e73
| -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 b15fd56a9dd..b318c906069 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 ff4dd8011e2..f2293b8f140 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 |