refresh kernel patches so that they apply cleanly

[openwrt/openwrt.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 2ed6f39e6bd21e4a6697b534ef25a78ababe261d..d72e809ef24dba1682bf6d3c51a9ebd5fcde157a 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,6 +1,6 @@
-diff -urN linux-2.6.19.old/include/linux/time.h linux-2.6.19.dev/include/linux/time.h
---- linux-2.6.19.old/include/linux/time.h      2006-11-29 22:57:37.000000000 +0100
-+++ linux-2.6.19.dev/include/linux/time.h      2006-12-14 03:14:05.000000000 +0100
+diff -urN linux-2.6.21.1.old/include/linux/time.h linux-2.6.21.1.dev/include/linux/time.h
+--- linux-2.6.21.1.old/include/linux/time.h    2007-04-27 23:49:26.000000000 +0200
++++ linux-2.6.21.1.dev/include/linux/time.h    2007-05-26 21:23:19.859617680 +0200
 @@ -1,6 +1,10 @@
  #ifndef _LINUX_TIME_H
  #define _LINUX_TIME_H
@@ -12,16 +12,16 @@ diff -urN linux-2.6.19.old/include/linux/time.h linux-2.6.19.dev/include/linux/t
  #include <linux/types.h>
  
  #ifdef __KERNEL__
-@@ -223,4 +227,6 @@
+@@ -224,4 +228,6 @@
   */
  #define TIMER_ABSTIME                 0x01
  
 +#endif /* __KERNEL__ DEBIAN */
 +
  #endif
-diff -urN linux-2.6.19.old/include/linux/types.h linux-2.6.19.dev/include/linux/types.h
---- linux-2.6.19.old/include/linux/types.h     2006-11-29 22:57:37.000000000 +0100
-+++ linux-2.6.19.dev/include/linux/types.h     2006-12-14 03:14:05.000000000 +0100
+diff -urN linux-2.6.21.1.old/include/linux/types.h linux-2.6.21.1.dev/include/linux/types.h
+--- linux-2.6.21.1.old/include/linux/types.h   2007-04-27 23:49:26.000000000 +0200
++++ linux-2.6.21.1.dev/include/linux/types.h   2007-05-26 21:23:19.859617680 +0200
 @@ -1,6 +1,14 @@
  #ifndef _LINUX_TYPES_H
  #define _LINUX_TYPES_H
@@ -37,7 +37,7 @@ diff -urN linux-2.6.19.old/include/linux/types.h linux-2.6.19.dev/include/linux/
  #ifdef        __KERNEL__
  
  #define BITS_TO_LONGS(bits) \
-@@ -156,6 +164,8 @@
+@@ -162,6 +170,8 @@
  
  #endif /* __KERNEL_STRICT_NAMES */