diff options
| author | Markus Wigge <markus@cultcom.de> | 2009-02-13 15:13:15 +0000 |
|---|---|---|
| committer | Markus Wigge <markus@cultcom.de> | 2009-02-13 15:13:15 +0000 |
| commit | f08084c027111077312214601754e362f8711bae (patch) | |
| tree | 4e2a2f732c095255da42d2a68c1a34805b9af9d9 | |
| parent | a177964b3acf59b4bbc773fb68c7e8578a6ffdfa (diff) | |
| download | upstream-f08084c027111077312214601754e362f8711bae.tar.gz upstream-f08084c027111077312214601754e362f8711bae.tar.bz2 upstream-f08084c027111077312214601754e362f8711bae.zip | |
- new upstream kernel 2.6.28.5
- the fix-serial_h patch does not apply anymore and is integrated
upstream now
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@14500 3c298f89-4303-0410-b956-a3cf2f4a3e73
| -rw-r--r-- | target/linux/generic-2.6/patches-2.6.28/960-fix-serial_h-includes.patch | 19 | ||||
| -rw-r--r-- | target/linux/x86/Makefile | 2 |
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 |