diff options
| author | Felix Fietkau <nbd@openwrt.org> | 2006-12-14 16:41:33 +0000 |
|---|---|---|
| committer | Felix Fietkau <nbd@openwrt.org> | 2006-12-14 16:41:33 +0000 |
| commit | d78864ef7c7b550de88f8494fed22bf6854c6627 (patch) | |
| tree | 1a38200fe1a33cb965650ca687167175938fbedd /target/linux/generic-2.6/patches/900-headers_type_and_time.patch | |
| parent | 881d8c8f18644c9dbebd14b0783ee56782964bce (diff) | |
| download | master-187ad058-d78864ef7c7b550de88f8494fed22bf6854c6627.tar.gz master-187ad058-d78864ef7c7b550de88f8494fed22bf6854c6627.tar.bz2 master-187ad058-d78864ef7c7b550de88f8494fed22bf6854c6627.zip | |
Upgrade to Linux 2.6.19
- 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
Diffstat (limited to 'target/linux/generic-2.6/patches/900-headers_type_and_time.patch')
| -rw-r--r-- | target/linux/generic-2.6/patches/900-headers_type_and_time.patch | 19 |
1 files changed, 9 insertions, 10 deletions
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 56a5ef3230..2ed6f39e6b 100644 --- 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.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 @@ -14,15 +12,16 @@ Update 2005-05-05 gotom, add __extension__ for linux/types.h. #include <linux/types.h> #ifdef __KERNEL__ -@@ -196,4 +200,6 @@ +@@ -223,4 +227,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 +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 @@ -36,9 +35,9 @@ Update 2005-05-05 gotom, add __extension__ for linux/types.h. +#else + #ifdef __KERNEL__ - #include <linux/config.h> -@@ -147,6 +157,8 @@ + #define BITS_TO_LONGS(bits) \ +@@ -156,6 +164,8 @@ #endif /* __KERNEL_STRICT_NAMES */ |