diff options
author | Felix Fietkau <nbd@openwrt.org> | 2007-06-16 01:56:04 +0000 |
---|---|---|
committer | Felix Fietkau <nbd@openwrt.org> | 2007-06-16 01:56:04 +0000 |
commit | f019ac4dc9b89958657dd8c9d81bb2e270c938e7 (patch) | |
tree | 59ba27f549ecae008485f94b3771c4fe1df4a563 /target/linux/generic-2.6/patches-2.6.22/900-headers_type_and_time.patch | |
parent | 4f16e9cc3e2c187d19b24785a55ce30a892efd68 (diff) | |
download | upstream-f019ac4dc9b89958657dd8c9d81bb2e270c938e7.tar.gz upstream-f019ac4dc9b89958657dd8c9d81bb2e270c938e7.tar.bz2 upstream-f019ac4dc9b89958657dd8c9d81bb2e270c938e7.zip |
prepare for the transition to linux 2.6.22 - make it possible to override the kernel version in the target makefile
SVN-Revision: 7644
Diffstat (limited to 'target/linux/generic-2.6/patches-2.6.22/900-headers_type_and_time.patch')
-rw-r--r-- | target/linux/generic-2.6/patches-2.6.22/900-headers_type_and_time.patch | 48 |
1 files changed, 48 insertions, 0 deletions
diff --git a/target/linux/generic-2.6/patches-2.6.22/900-headers_type_and_time.patch b/target/linux/generic-2.6/patches-2.6.22/900-headers_type_and_time.patch new file mode 100644 index 0000000000..7eedc234ee --- /dev/null +++ b/target/linux/generic-2.6/patches-2.6.22/900-headers_type_and_time.patch @@ -0,0 +1,48 @@ +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 + ++#ifndef __KERNEL__ ++#include <time.h> ++#else ++ + #include <linux/types.h> + + #ifdef __KERNEL__ +@@ -225,4 +229,6 @@ + */ + #define TIMER_ABSTIME 0x01 + ++#endif /* __KERNEL__ DEBIAN */ ++ + #endif +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 + ++/* Debian: Use userland types instead. */ ++#ifndef __KERNEL__ ++# include <sys/types.h> ++/* For other kernel headers. */ ++# include <linux/posix_types.h> ++# include <asm/types.h> ++#else ++ + #ifdef __KERNEL__ + + #define BITS_TO_LONGS(bits) \ +@@ -162,6 +170,8 @@ + + #endif /* __KERNEL_STRICT_NAMES */ + ++#endif /* __KERNEL__ DEBIAN */ ++ + /* + * Below are truly Linux-specific types that should never collide with + * any application/library that wants linux/types.h. |