kernel-headers: fix 2.6.28.1 serial.h (unbreaks directfb serialmouse.c)
authorPeter Korsgaard <jacmet@sunsite.dk>
Fri, 23 Jan 2009 13:12:57 +0000 (13:12 -0000)
committerPeter Korsgaard <jacmet@sunsite.dk>
Fri, 23 Jan 2009 13:12:57 +0000 (13:12 -0000)
toolchain/kernel-headers/linux-2.6.28.1-fix-serial.h-include.patch [new file with mode: 0644]

diff --git a/toolchain/kernel-headers/linux-2.6.28.1-fix-serial.h-include.patch b/toolchain/kernel-headers/linux-2.6.28.1-fix-serial.h-include.patch
new file mode 100644 (file)
index 0000000..f6504aa
--- /dev/null
@@ -0,0 +1,55 @@
+From 60c20fb8c00a2b23308ae4517f145383bc66d291 Mon Sep 17 00:00:00 2001
+From: Andy Whitcroft <apw@canonical.com>
+Date: Fri, 2 Jan 2009 13:49:04 +0000
+Subject: [PATCH] serial: RS485 ioctl structure uses __u32 include linux/types.h
+MIME-Version: 1.0
+Content-Type: text/plain; charset=utf-8
+Content-Transfer-Encoding: 8bit
+
+In the commit below a new struct serial_rs485 was introduced for a new
+ioctl:
+
+    commit c26c56c0f40e200e61d1390629c806f6adaffbcc
+    Author: Alan Cox <alan@redhat.com>
+    Date:   Mon Oct 13 10:37:48 2008 +0100
+
+       tty: Cris has a nice RS485 ioctl so we should steal it
+
+This structure uses the __u32 types for some of its members, which leads
+to the following compile error:
+
+    $ cc -I.../include -c X.c
+    In file included from X.c:2: .../include/linux/serial.h:185:
+               error: expected specifier-qualifier-list before ‘__u32’
+    $
+
+It seems that these types are appropriate for this structure as it is
+to be exposed to userspace.  These types are available via linux/types.h
+so move the include of that outside the __KERNEL__ section.
+
+Signed-off-by: Andy Whitcroft <apw@canonical.com>
+Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
+Signed-off-by: Alan Cox <alan@redhat.com>
+Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
+---
+ include/linux/serial.h |    3 ++-
+ 1 files changed, 2 insertions(+), 1 deletions(-)
+
+diff --git a/include/linux/serial.h b/include/linux/serial.h
+index 1ea8d92..9136cc5 100644
+--- a/include/linux/serial.h
++++ b/include/linux/serial.h
+@@ -10,8 +10,9 @@
+ #ifndef _LINUX_SERIAL_H
+ #define _LINUX_SERIAL_H
+-#ifdef __KERNEL__
+ #include <linux/types.h>
++
++#ifdef __KERNEL__
+ #include <asm/page.h>
+ /*
+-- 
+1.5.6.5
+