Commit 35dafd0b authored by Peter Korsgaard's avatar Peter Korsgaard
Browse files

kernel-headers: bump 2.6.27/2.6.28 stable versions

parent 7ac25f13

toolchain/kernel-headers/Config.in

+2 −2
Original line number Diff line number Diff line
@@ -117,7 +117,7 @@ config BR2_DEFAULT_KERNEL_HEADERS 
	default "2.6.24.7"	if BR2_KERNEL_HEADERS_2_6_24

	default "2.6.25.19"	if BR2_KERNEL_HEADERS_2_6_25

	default "2.6.26.8"	if BR2_KERNEL_HEADERS_2_6_26

	default "2.6.27.15"	if BR2_KERNEL_HEADERS_2_6_27

	default "2.6.28.4"	if BR2_KERNEL_HEADERS_2_6_28

	default "2.6.27.16"	if BR2_KERNEL_HEADERS_2_6_27

	default "2.6.28.5"	if BR2_KERNEL_HEADERS_2_6_28

	default "2.6"		if BR2_KERNEL_HEADERS_SNAP

toolchain/kernel-headers/linux-2.6.28.4-fix-serial.h-include.patch

deleted100644 → 0
+0 −55
Original line number Diff line number Diff line 
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