diff options
| author | Imre Kaloz <kaloz@openwrt.org> | 2008-05-30 16:30:51 +0000 |
|---|---|---|
| committer | Imre Kaloz <kaloz@openwrt.org> | 2008-05-30 16:30:51 +0000 |
| commit | f664b7cb17d20e7a32e9bd07e85c9bb7ecb9e2ce (patch) | |
| tree | eee31435ae91d4838abf2a566762712522a30f1f /target/linux/generic-2.6/patches-2.6.25/900-headers_type_and_time.patch | |
| parent | 83072a149a7d7e6faf7276db7a5f6440d7fa0d24 (diff) | |
| download | master-31e0f0ae-f664b7cb17d20e7a32e9bd07e85c9bb7ecb9e2ce.tar.gz master-31e0f0ae-f664b7cb17d20e7a32e9bd07e85c9bb7ecb9e2ce.tar.bz2 master-31e0f0ae-f664b7cb17d20e7a32e9bd07e85c9bb7ecb9e2ce.zip | |
refresh generic 2.6.25 patches to match upstream style
SVN-Revision: 11296
Diffstat (limited to 'target/linux/generic-2.6/patches-2.6.25/900-headers_type_and_time.patch')
| -rw-r--r-- | target/linux/generic-2.6/patches-2.6.25/900-headers_type_and_time.patch | 16 |
1 files changed, 6 insertions, 10 deletions
diff --git a/target/linux/generic-2.6/patches-2.6.25/900-headers_type_and_time.patch b/target/linux/generic-2.6/patches-2.6.25/900-headers_type_and_time.patch index 07c5129d08..b15fd56a9d 100644 --- a/target/linux/generic-2.6/patches-2.6.25/900-headers_type_and_time.patch +++ b/target/linux/generic-2.6/patches-2.6.25/900-headers_type_and_time.patch @@ -1,7 +1,5 @@ -Index: linux-2.6.25.4/include/linux/time.h -=================================================================== ---- linux-2.6.25.4.orig/include/linux/time.h -+++ linux-2.6.25.4/include/linux/time.h +--- a/include/linux/time.h ++++ b/include/linux/time.h @@ -1,6 +1,10 @@ #ifndef _LINUX_TIME_H #define _LINUX_TIME_H @@ -13,17 +11,15 @@ Index: linux-2.6.25.4/include/linux/time.h #include <linux/types.h> #ifdef __KERNEL__ -@@ -232,4 +236,6 @@ struct itimerval { +@@ -232,4 +236,6 @@ */ #define TIMER_ABSTIME 0x01 +#endif /* __KERNEL__ DEBIAN */ + #endif -Index: linux-2.6.25.4/include/linux/types.h -=================================================================== ---- linux-2.6.25.4.orig/include/linux/types.h -+++ linux-2.6.25.4/include/linux/types.h +--- a/include/linux/types.h ++++ b/include/linux/types.h @@ -1,6 +1,14 @@ #ifndef _LINUX_TYPES_H #define _LINUX_TYPES_H @@ -39,7 +35,7 @@ Index: linux-2.6.25.4/include/linux/types.h #ifdef __KERNEL__ #define DECLARE_BITMAP(name,bits) \ -@@ -161,6 +169,8 @@ typedef unsigned long blkcnt_t; +@@ -161,6 +169,8 @@ #endif /* __KERNEL_STRICT_NAMES */ |