aboutsummaryrefslogtreecommitdiffstats
path: root/target
diff options
context:
space:
mode:
authorMarkus Wigge <mwigge@marcant.net>2009-02-13 15:13:15 +0000
committerMarkus Wigge <mwigge@marcant.net>2009-02-13 15:13:15 +0000
commit9dc8fd5b7f6ec4ac449a4d044234e0af22d1bc53 (patch)
treeaf3d41012a0c6ee1cac75086c6380b0e1e8ba389 /target
parent474cf6d326f9dee602e01ba929ff4537413be459 (diff)
downloadupstream-9dc8fd5b7f6ec4ac449a4d044234e0af22d1bc53.tar.gz
upstream-9dc8fd5b7f6ec4ac449a4d044234e0af22d1bc53.tar.bz2
upstream-9dc8fd5b7f6ec4ac449a4d044234e0af22d1bc53.zip
- new upstream kernel 2.6.28.5 - the fix-serial_h patch does not apply anymore and is integrated upstream now
SVN-Revision: 14500
Diffstat (limited to 'target')
-rw-r--r--target/linux/generic-2.6/patches-2.6.28/960-fix-serial_h-includes.patch19
-rw-r--r--target/linux/x86/Makefile2
2 files changed, 1 insertions, 20 deletions
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 <lars@metafoo.de>
-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 <linux/types.h>
-+#ifdef __KERNEL__
- #include <asm/page.h>
-
- /*
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