From 35dafd0ba767c0e305c0e3978eb375cb2988cd3e Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Thu, 12 Feb 2009 20:21:12 +0000 Subject: [PATCH] kernel-headers: bump 2.6.27/2.6.28 stable versions --- toolchain/kernel-headers/Config.in | 4 +- .../linux-2.6.28.4-fix-serial.h-include.patch | 55 ------------------- ...ux-2.6.28.5-cris-eth-driver-netpoll.patch} | 0 ...atch => linux-2.6.28.5-cris-headers.patch} | 0 ...> linux-2.6.28.5-cris-objcopy-flags.patch} | 0 5 files changed, 2 insertions(+), 57 deletions(-) delete mode 100644 toolchain/kernel-headers/linux-2.6.28.4-fix-serial.h-include.patch rename toolchain/kernel-headers/{linux-2.6.28.4-cris-eth-driver-netpoll.patch => linux-2.6.28.5-cris-eth-driver-netpoll.patch} (100%) rename toolchain/kernel-headers/{linux-2.6.28.4-cris-headers.patch => linux-2.6.28.5-cris-headers.patch} (100%) rename toolchain/kernel-headers/{linux-2.6.28.4-cris-objcopy-flags.patch => linux-2.6.28.5-cris-objcopy-flags.patch} (100%) diff --git a/toolchain/kernel-headers/Config.in b/toolchain/kernel-headers/Config.in index e984474699..8749b63616 100644 --- a/toolchain/kernel-headers/Config.in +++ b/toolchain/kernel-headers/Config.in @@ -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 diff --git a/toolchain/kernel-headers/linux-2.6.28.4-fix-serial.h-include.patch b/toolchain/kernel-headers/linux-2.6.28.4-fix-serial.h-include.patch deleted file mode 100644 index f6504aaaba..0000000000 --- a/toolchain/kernel-headers/linux-2.6.28.4-fix-serial.h-include.patch +++ /dev/null @@ -1,55 +0,0 @@ -From 60c20fb8c00a2b23308ae4517f145383bc66d291 Mon Sep 17 00:00:00 2001 -From: Andy Whitcroft -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 - 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 -Signed-off-by: Andrew Morton -Signed-off-by: Alan Cox -Signed-off-by: Linus Torvalds ---- - 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 -+ -+#ifdef __KERNEL__ - #include - - /* --- -1.5.6.5 - diff --git a/toolchain/kernel-headers/linux-2.6.28.4-cris-eth-driver-netpoll.patch b/toolchain/kernel-headers/linux-2.6.28.5-cris-eth-driver-netpoll.patch similarity index 100% rename from toolchain/kernel-headers/linux-2.6.28.4-cris-eth-driver-netpoll.patch rename to toolchain/kernel-headers/linux-2.6.28.5-cris-eth-driver-netpoll.patch diff --git a/toolchain/kernel-headers/linux-2.6.28.4-cris-headers.patch b/toolchain/kernel-headers/linux-2.6.28.5-cris-headers.patch similarity index 100% rename from toolchain/kernel-headers/linux-2.6.28.4-cris-headers.patch rename to toolchain/kernel-headers/linux-2.6.28.5-cris-headers.patch diff --git a/toolchain/kernel-headers/linux-2.6.28.4-cris-objcopy-flags.patch b/toolchain/kernel-headers/linux-2.6.28.5-cris-objcopy-flags.patch similarity index 100% rename from toolchain/kernel-headers/linux-2.6.28.4-cris-objcopy-flags.patch rename to toolchain/kernel-headers/linux-2.6.28.5-cris-objcopy-flags.patch