1 diff -urN linux-2.6.21.1.old/include/linux/time.h linux-2.6.21.1.dev/include/linux/time.h
2 --- linux-2.6.21.1.old/include/linux/time.h 2007-04-27 23:49:26.000000000 +0200
3 +++ linux-2.6.21.1.dev/include/linux/time.h 2007-05-26 21:23:19.859617680 +0200
12 #include <linux/types.h>
17 #define TIMER_ABSTIME 0x01
19 +#endif /* __KERNEL__ DEBIAN */
22 diff -urN linux-2.6.21.1.old/include/linux/types.h linux-2.6.21.1.dev/include/linux/types.h
23 --- linux-2.6.21.1.old/include/linux/types.h 2007-04-27 23:49:26.000000000 +0200
24 +++ linux-2.6.21.1.dev/include/linux/types.h 2007-05-26 21:23:19.859617680 +0200
26 #ifndef _LINUX_TYPES_H
27 #define _LINUX_TYPES_H
29 +/* Debian: Use userland types instead. */
31 +# include <sys/types.h>
32 +/* For other kernel headers. */
33 +# include <linux/posix_types.h>
34 +# include <asm/types.h>
39 #define BITS_TO_LONGS(bits) \
42 #endif /* __KERNEL_STRICT_NAMES */
44 +#endif /* __KERNEL__ DEBIAN */
47 * Below are truly Linux-specific types that should never collide with
48 * any application/library that wants linux/types.h.