mirror of
git://projects.qi-hardware.com/openwrt-xburst.git
synced 2024-09-12 13:23:39 +03:00
c92885c466
- Includes large parts of the patch from #1021 by dpalffy - Includes RB532 NAND driver changes by n0-1 git-svn-id: svn://svn.openwrt.org/openwrt/trunk@5789 3c298f89-4303-0410-b956-a3cf2f4a3e73
49 lines
1.3 KiB
Diff
49 lines
1.3 KiB
Diff
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
|
|
@@ -1,6 +1,10 @@
|
|
#ifndef _LINUX_TIME_H
|
|
#define _LINUX_TIME_H
|
|
|
|
+#ifndef __KERNEL__
|
|
+#include <time.h>
|
|
+#else
|
|
+
|
|
#include <linux/types.h>
|
|
|
|
#ifdef __KERNEL__
|
|
@@ -223,4 +227,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
|
|
@@ -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) \
|
|
@@ -156,6 +164,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.
|