summaryrefslogtreecommitdiffstats
path: root/target/linux/generic-2.6/patches-2.6.24/900-headers_type_and_time.patch
diff options
context:
space:
mode:
authorImre Kaloz <kaloz@openwrt.org>2008-05-30 17:19:24 +0000
committerImre Kaloz <kaloz@openwrt.org>2008-05-30 17:19:24 +0000
commit74215746b332d79139e92650a4240c97e3a88845 (patch)
treec4c9b4bf8791e93a1d21aad5b904bb17a814c726 /target/linux/generic-2.6/patches-2.6.24/900-headers_type_and_time.patch
parent2259476f060ea4b9ca9cffa82ad052a690606fab (diff)
downloadmaster-31e0f0ae-74215746b332d79139e92650a4240c97e3a88845.tar.gz
master-31e0f0ae-74215746b332d79139e92650a4240c97e3a88845.tar.bz2
master-31e0f0ae-74215746b332d79139e92650a4240c97e3a88845.zip
refresh generic 2.6.24 patches to match upstream style
SVN-Revision: 11302
Diffstat (limited to 'target/linux/generic-2.6/patches-2.6.24/900-headers_type_and_time.patch')
-rw-r--r--target/linux/generic-2.6/patches-2.6.24/900-headers_type_and_time.patch16
1 files changed, 6 insertions, 10 deletions
diff --git a/target/linux/generic-2.6/patches-2.6.24/900-headers_type_and_time.patch b/target/linux/generic-2.6/patches-2.6.24/900-headers_type_and_time.patch
index df6a5381a9..691194de89 100644
--- a/target/linux/generic-2.6/patches-2.6.24/900-headers_type_and_time.patch
+++ b/target/linux/generic-2.6/patches-2.6.24/900-headers_type_and_time.patch
@@ -1,7 +1,5 @@
-Index: linux-2.6.24.7/include/linux/time.h
-===================================================================
---- linux-2.6.24.7.orig/include/linux/time.h
-+++ linux-2.6.24.7/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.24.7/include/linux/time.h
#include <linux/types.h>
#ifdef __KERNEL__
-@@ -231,4 +235,6 @@ struct itimerval {
+@@ -231,4 +235,6 @@
*/
#define TIMER_ABSTIME 0x01
+#endif /* __KERNEL__ DEBIAN */
+
#endif
-Index: linux-2.6.24.7/include/linux/types.h
-===================================================================
---- linux-2.6.24.7.orig/include/linux/types.h
-+++ linux-2.6.24.7/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.24.7/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 */