refresh generic 2.6.25 patches to match upstream style

[openwrt/svn-archive/archive.git] / target / linux / generic-2.6 / patches-2.6.25 / 900-headers_type_and_time.patch

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 07c5129d086ec056694ed81e13a2bafb48f41e07..b15fd56a9dd8ba81ce61db5862f98f0576617c01 100644 (file)
--- 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 */