1 diff -urN linux-2.6.19.old/include/linux/time.h linux-2.6.19.dev/include/linux/time.h
2 --- linux-2.6.19.old/include/linux/time.h 2006-11-29 22:57:37.000000000 +0100
3 +++ linux-2.6.19.dev/include/linux/time.h 2006-12-14 03:14:05.000000000 +0100
12 #include <linux/types.h>
17 #define TIMER_ABSTIME 0x01
19 +#endif /* __KERNEL__ DEBIAN */
22 diff -urN linux-2.6.19.old/include/linux/types.h linux-2.6.19.dev/include/linux/types.h
23 --- linux-2.6.19.old/include/linux/types.h 2006-11-29 22:57:37.000000000 +0100
24 +++ linux-2.6.19.dev/include/linux/types.h 2006-12-14 03:14:05.000000000 +0100
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.