add mini_fo fix from #1801

[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 09118bc0e0018f47583a4fc53021cfbe398af8a8..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,8 +1,6 @@
-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
+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
@@ -14,16 +12,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 @@
   */
  #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
-@@ -1,6 +1,16 @@
+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
  
@@ -33,14 +32,12 @@ Update 2005-05-05 gotom, add __extension__ for linux/types.h.
 +/* For other kernel headers.  */
 +# include <linux/posix_types.h>
 +# include <asm/types.h>
-+/* For util-linux / cryptoloop.  How lame.  */
-+typedef __u32 __kernel_dev_t;
 +#else
 +
  #ifdef        __KERNEL__
- #include <linux/config.h>
  
-@@ -147,6 +157,8 @@
+ #define BITS_TO_LONGS(bits) \
+@@ -162,6 +170,8 @@
  
  #endif /* __KERNEL_STRICT_NAMES */
  
@@ -49,16 +46,3 @@ Update 2005-05-05 gotom, add __extension__ for linux/types.h.
  /*
   * Below are truly Linux-specific types that should never collide with
   * any application/library that wants linux/types.h.
-@@ -167,9 +179,9 @@
- typedef __u16 __bitwise __be16;
- typedef __u32 __bitwise __le32;
- typedef __u32 __bitwise __be32;
--#if defined(__GNUC__) && !defined(__STRICT_ANSI__)
--typedef __u64 __bitwise __le64;
--typedef __u64 __bitwise __be64;
-+#if defined(__GNUC__)
-+__extension__ typedef __u64 __bitwise __le64;
-+__extension__ typedef __u64 __bitwise __be64;
- #endif
- 
- #ifdef __KERNEL__