From: Markus Wigge Date: Fri, 13 Feb 2009 15:13:15 +0000 (+0000) Subject: - new upstream kernel 2.6.28.5 - the fix-serial_h patch does not apply anymore and... X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=9dc8fd5b7f6ec4ac449a4d044234e0af22d1bc53;p=openwrt%2Fstaging%2Fjow.git - new upstream kernel 2.6.28.5 - the fix-serial_h patch does not apply anymore and is integrated upstream now SVN-Revision: 14500 --- diff --git a/target/linux/generic-2.6/patches-2.6.28/960-fix-serial_h-includes.patch b/target/linux/generic-2.6/patches-2.6.28/960-fix-serial_h-includes.patch deleted file mode 100644 index 093ff590b0..0000000000 --- a/target/linux/generic-2.6/patches-2.6.28/960-fix-serial_h-includes.patch +++ /dev/null @@ -1,19 +0,0 @@ -commit e611993564bf0bc200c430ef8d25699289c34c70 -Author: Lars-Peter Clausen -Date: Tue Feb 3 00:16:19 2009 +0100 - - struct serial_rs485 contains __32 fields and is exported to userspace so it - needs linux/types.h in userspace aswell. - ---- a/include/linux/serial.h -+++ b/include/linux/serial.h -@@ -10,8 +10,8 @@ - #ifndef _LINUX_SERIAL_H - #define _LINUX_SERIAL_H - --#ifdef __KERNEL__ - #include -+#ifdef __KERNEL__ - #include - - /* diff --git a/target/linux/x86/Makefile b/target/linux/x86/Makefile index 0dd1700f82..89d90782e9 100644 --- a/target/linux/x86/Makefile +++ b/target/linux/x86/Makefile @@ -12,7 +12,7 @@ BOARDNAME:=x86 FEATURES:=squashfs jffs2 ext2 vdi vmdk SUBTARGETS=generic -LINUX_VERSION:=2.6.28.4 +LINUX_VERSION:=2.6.28.5 LINUX_KARCH:=x86 include $(INCLUDE_DIR)/target.mk