summaryrefslogtreecommitdiffstats
path: root/meta/packages/linux-libc-headers/linux-libc-headers-2.6.15.99
diff options
context:
space:
mode:
Diffstat (limited to 'meta/packages/linux-libc-headers/linux-libc-headers-2.6.15.99')
-rw-r--r--meta/packages/linux-libc-headers/linux-libc-headers-2.6.15.99/3477-1.patch43
-rw-r--r--meta/packages/linux-libc-headers/linux-libc-headers-2.6.15.99/asm-arch-irqs.patch19
-rw-r--r--meta/packages/linux-libc-headers/linux-libc-headers-2.6.15.99/linux-netdevice.patch11
-rw-r--r--meta/packages/linux-libc-headers/linux-libc-headers-2.6.15.99/linux-netfilter_ipv4.patch31
-rw-r--r--meta/packages/linux-libc-headers/linux-libc-headers-2.6.15.99/linux-rtc.patch11
-rw-r--r--meta/packages/linux-libc-headers/linux-libc-headers-2.6.15.99/linux-videodev2.patch45
6 files changed, 160 insertions, 0 deletions
diff --git a/meta/packages/linux-libc-headers/linux-libc-headers-2.6.15.99/3477-1.patch b/meta/packages/linux-libc-headers/linux-libc-headers-2.6.15.99/3477-1.patch
new file mode 100644
index 0000000000..1b207b3cd9
--- /dev/null
+++ b/meta/packages/linux-libc-headers/linux-libc-headers-2.6.15.99/3477-1.patch
@@ -0,0 +1,43 @@
1From: Nicolas Pitre <nico@cam.org>
2Date: Sat, 15 Apr 2006 15:10:43 +0000 (+0100)
3Subject: [ARM] 3477/1: ARM EABI: undefine removed syscalls
4X-Git-Url: http://git.infradead.org/?p=mtd-2.6.git;a=commitdiff;h=463b158aab247b600e4e93614b7b8f42a66331c9
5
6[ARM] 3477/1: ARM EABI: undefine removed syscalls
7
8Patch from Nicolas Pitre
9
10Avoid confusion for libraries assuming that a given syscall is available
11when corresponding symbol is defined.
12
13Signed-off-by: Nicolas Pitre <nico@cam.org>
14Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
15---
16
17--- a/include/asm-arm/unistd.h
18+++ b/include/asm-arm/unistd.h
19@@ -360,6 +360,24 @@
20 #define __ARM_NR_usr32 (__ARM_NR_BASE+4)
21 #define __ARM_NR_set_tls (__ARM_NR_BASE+5)
22
23+/*
24+ * The following syscalls are obsolete and no longer available for EABI.
25+ */
26+#if defined(__ARM_EABI__)
27+#undef __NR_time
28+#undef __NR_umount
29+#undef __NR_stime
30+#undef __NR_alarm
31+#undef __NR_utime
32+#undef __NR_getrlimit
33+#undef __NR_select
34+#undef __NR_readdir
35+#undef __NR_mmap
36+#undef __NR_socketcall
37+#undef __NR_syscall
38+#undef __NR_ipc
39+#endif
40+
41 #define __sys2(x) #x
42 #define __sys1(x) __sys2(x)
43
diff --git a/meta/packages/linux-libc-headers/linux-libc-headers-2.6.15.99/asm-arch-irqs.patch b/meta/packages/linux-libc-headers/linux-libc-headers-2.6.15.99/asm-arch-irqs.patch
new file mode 100644
index 0000000000..4785275db4
--- /dev/null
+++ b/meta/packages/linux-libc-headers/linux-libc-headers-2.6.15.99/asm-arch-irqs.patch
@@ -0,0 +1,19 @@
1--- linux-libc-headers-2.6.15.99/include/asm-arm/arch-ebsa285/irqs.h.orig 2006-03-19 17:01:59.000000000 +0100
2+++ linux-libc-headers-2.6.15.99/include/asm-arm/arch-ebsa285/irqs.h 2006-03-19 17:02:50.000000000 +0100
3@@ -8,7 +8,6 @@
4 * 20-Jan-1998 RMK Started merge of EBSA286, CATS and NetWinder
5 * 01-Feb-1999 PJB ISA IRQs start at 0 not 16
6 */
7-#include <asm/mach-types.h>
8
9 #define NR_IRQS 36
10 #define NR_DC21285_IRQS 16
11@@ -92,7 +91,7 @@
12 #undef RTC_IRQ
13 #define RTC_IRQ IRQ_ISA_RTC_ALARM
14 #define I8042_KBD_IRQ IRQ_ISA_KEYBOARD
15-#define I8042_AUX_IRQ (machine_is_netwinder() ? IRQ_NETWINDER_PS2MOUSE : IRQ_ISA_PS2MOUSE)
16+#define I8042_AUX_IRQ IRQ_ISA_PS2MOUSE
17 #define IRQ_FLOPPYDISK IRQ_ISA_FLOPPY
18
19 #define irq_canonicalize(_i) (((_i) == IRQ_ISA_CASCADE) ? IRQ_ISA_2 : _i)
diff --git a/meta/packages/linux-libc-headers/linux-libc-headers-2.6.15.99/linux-netdevice.patch b/meta/packages/linux-libc-headers/linux-libc-headers-2.6.15.99/linux-netdevice.patch
new file mode 100644
index 0000000000..588aea4ba8
--- /dev/null
+++ b/meta/packages/linux-libc-headers/linux-libc-headers-2.6.15.99/linux-netdevice.patch
@@ -0,0 +1,11 @@
1--- linux-libc-headers-2.6.15.99/include/linux/netdevice.h.orig 2006-04-29 14:10:39.245687500 +0200
2+++ linux-libc-headers-2.6.15.99/include/linux/netdevice.h 2006-04-29 14:11:08.819535750 +0200
3@@ -100,8 +100,6 @@
4 unsigned long tx_compressed;
5 };
6
7-extern int __init netdev_boot_setup(char *str);
8-
9 /* Media selection options. */
10 enum {
11 IF_PORT_UNKNOWN = 0,
diff --git a/meta/packages/linux-libc-headers/linux-libc-headers-2.6.15.99/linux-netfilter_ipv4.patch b/meta/packages/linux-libc-headers/linux-libc-headers-2.6.15.99/linux-netfilter_ipv4.patch
new file mode 100644
index 0000000000..f7f77af0de
--- /dev/null
+++ b/meta/packages/linux-libc-headers/linux-libc-headers-2.6.15.99/linux-netfilter_ipv4.patch
@@ -0,0 +1,31 @@
1iptables 1.3.3 assumes that ipt_scpt.h defines ELEMCOUNT, but ipt_scpt.h
2moved to ARRAY_SIZE (which would be defined in linux/kernel.h).
3The ip_conntrack_dir definition now resides in linux/netfilter/ip_conntrack_common.h
4
5--- linux-libc-headers-2.6.15.99/include/linux/netfilter_ipv4/ipt_sctp.h.orig 2006-03-20 22:03:04.000000000 +0100
6+++ linux-libc-headers-2.6.15.99/include/linux/netfilter_ipv4/ipt_sctp.h 2006-03-20 22:07:09.000000000 +0100
7@@ -7,6 +7,8 @@
8
9 #define IPT_SCTP_VALID_FLAGS 0x07
10
11+#define ARRAY_SIZE(x) (sizeof(x) / sizeof((x)[0]))
12+#define ELEMCOUNT(x) (sizeof(x) / sizeof((x)[0]))
13
14 struct ipt_sctp_flag_info {
15 u_int8_t chunktype;
16--- linux-libc-headers-2.6.15.99/include/linux/netfilter_ipv4/ip_conntrack_tuple.h.orig 2006-03-20 21:51:10.000000000 +0100
17+++ linux-libc-headers-2.6.15.99/include/linux/netfilter_ipv4/ip_conntrack_tuple.h 2006-03-20 21:51:12.000000000 +0100
18@@ -89,13 +89,6 @@
19 (tuple)->dst.u.all = 0; \
20 } while (0)
21
22-enum ip_conntrack_dir
23-{
24- IP_CT_DIR_ORIGINAL,
25- IP_CT_DIR_REPLY,
26- IP_CT_DIR_MAX
27-};
28-
29 static inline int ip_ct_tuple_src_equal(const struct ip_conntrack_tuple *t1,
30 const struct ip_conntrack_tuple *t2)
31 {
diff --git a/meta/packages/linux-libc-headers/linux-libc-headers-2.6.15.99/linux-rtc.patch b/meta/packages/linux-libc-headers/linux-libc-headers-2.6.15.99/linux-rtc.patch
new file mode 100644
index 0000000000..36b80fb9d2
--- /dev/null
+++ b/meta/packages/linux-libc-headers/linux-libc-headers-2.6.15.99/linux-rtc.patch
@@ -0,0 +1,11 @@
1--- linux-libc-headers-2.6.15.99/include/linux/rtc.h.orig 2006-03-19 12:31:07.000000000 +0100
2+++ linux-libc-headers-2.6.15.99/include/linux/rtc.h 2006-03-19 12:31:14.000000000 +0100
3@@ -11,8 +11,6 @@
4 #ifndef _LINUX_RTC_H_
5 #define _LINUX_RTC_H_
6
7-#include <linux/interrupt.h>
8-
9 /*
10 * The struct used to pass data via the following ioctl. Similar to the
11 * struct tm in <time.h>, but it needs to be here so that the kernel
diff --git a/meta/packages/linux-libc-headers/linux-libc-headers-2.6.15.99/linux-videodev2.patch b/meta/packages/linux-libc-headers/linux-libc-headers-2.6.15.99/linux-videodev2.patch
new file mode 100644
index 0000000000..95335c99b6
--- /dev/null
+++ b/meta/packages/linux-libc-headers/linux-libc-headers-2.6.15.99/linux-videodev2.patch
@@ -0,0 +1,45 @@
1--- linux-libc-headers-2.6.15.99/include/linux/videodev2.h.orig 2006-03-20 11:14:35.000000000 +0100
2+++ linux-libc-headers-2.6.15.99/include/linux/videodev2.h 2006-03-20 11:14:37.000000000 +0100
3@@ -15,7 +15,32 @@
4 */
5 #include <sys/time.h> /* need struct timeval */
6 #include <asm/types.h> /* needed __u64 */
7-
8+
9+#define OBSOLETE_OWNER 1 /* It will be removed for 2.6.15 */
10+#define HAVE_V4L2 1
11+
12+/*
13+ * Common stuff for both V4L1 and V4L2
14+ * Moved from videodev.h
15+ */
16+
17+#define VIDEO_MAX_FRAME 32
18+
19+#define VID_TYPE_CAPTURE 1 /* Can capture */
20+#define VID_TYPE_TUNER 2 /* Can tune */
21+#define VID_TYPE_TELETEXT 4 /* Does teletext */
22+#define VID_TYPE_OVERLAY 8 /* Overlay onto frame buffer */
23+#define VID_TYPE_CHROMAKEY 16 /* Overlay by chromakey */
24+#define VID_TYPE_CLIPPING 32 /* Can clip */
25+#define VID_TYPE_FRAMERAM 64 /* Uses the frame buffer memory */
26+#define VID_TYPE_SCALES 128 /* Scalable */
27+#define VID_TYPE_MONOCHROME 256 /* Monochrome only */
28+#define VID_TYPE_SUBCAPTURE 512 /* Can capture subareas of the image */
29+#define VID_TYPE_MPEG_DECODER 1024 /* Can decode MPEG streams */
30+#define VID_TYPE_MPEG_ENCODER 2048 /* Can encode MPEG streams */
31+#define VID_TYPE_MJPEG_DECODER 4096 /* Can decode MJPEG streams */
32+#define VID_TYPE_MJPEG_ENCODER 8192 /* Can encode MJPEG streams */
33+
34 /*
35 * M I S C E L L A N E O U S
36 */
37@@ -464,7 +489,7 @@
38 struct v4l2_clip
39 {
40 struct v4l2_rect c;
41- struct v4l2_clip __user *next;
42+ struct v4l2_clip *next;
43 };
44
45 struct v4l2_window