refresh generic 2.6.21 patches

[openwrt/staging/dedeckeh.git] / target / linux / generic-2.6 / patches / 900-headers_type_and_time.patch

diff --git a/target/linux/generic-2.6/patches/900-headers_type_and_time.patch b/target/linux/generic-2.6/patches/900-headers_type_and_time.patch
index 56a5ef32306a7a19b6118b08520da23517f8c16d..3029ce28ec9f478078c95a94ceb816c2bcb0e2af 100644 (file)
--- a/target/linux/generic-2.6/patches/900-headers_type_and_time.patch
+++ b/target/linux/generic-2.6/patches/900-headers_type_and_time.patch
@@ -1,8 +1,7 @@
-Taken from Debian linux-kernel-headers package
-Update 2005-05-05 gotom, add __extension__ for linux/types.h.
-
---- linux.old/include/linux/time.h     2006-06-05 13:18:23.000000000 -0400
-+++ linux.dev/include/linux/time.h     2006-06-10 00:16:51.962628154 -0400
+Index: linux-2.6.21.7/include/linux/time.h
+===================================================================
+--- linux-2.6.21.7.orig/include/linux/time.h
++++ linux-2.6.21.7/include/linux/time.h
 @@ -1,6 +1,10 @@
  #ifndef _LINUX_TIME_H
  #define _LINUX_TIME_H
@@ -14,15 +13,17 @@ Update 2005-05-05 gotom, add __extension__ for linux/types.h.
  #include <linux/types.h>
  
  #ifdef __KERNEL__
-@@ -196,4 +200,6 @@
+@@ -224,4 +228,6 @@ struct itimerval {
   */
  #define TIMER_ABSTIME                 0x01
  
 +#endif /* __KERNEL__ DEBIAN */
 +
  #endif
---- linux.old/include/linux/types.h    2006-06-05 13:18:23.000000000 -0400
-+++ linux.dev/include/linux/types.h    2006-06-10 00:16:51.962628154 -0400
+Index: linux-2.6.21.7/include/linux/types.h
+===================================================================
+--- linux-2.6.21.7.orig/include/linux/types.h
++++ linux-2.6.21.7/include/linux/types.h
 @@ -1,6 +1,14 @@
  #ifndef _LINUX_TYPES_H
  #define _LINUX_TYPES_H
@@ -36,9 +37,9 @@ Update 2005-05-05 gotom, add __extension__ for linux/types.h.
 +#else
 +
  #ifdef        __KERNEL__
- #include <linux/config.h>
  
-@@ -147,6 +157,8 @@
+ #define BITS_TO_LONGS(bits) \
+@@ -162,6 +170,8 @@ typedef unsigned long blkcnt_t;
  
  #endif /* __KERNEL_STRICT_NAMES */