diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2010-04-04 10:34:02 +0200 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2010-04-04 10:34:02 +0200 |
| commit | 5042ac8e5927d0089d3902b1c37e5bcc1565d053 (patch) | |
| tree | cd2be3085808c5ac59dd70f9c610c6a40bfe3ffd /toolchain/kernel-headers/patches/etrax-header.patch | |
| parent | 401dabf66529cfb5ab47b4c78d5e25fd493eef1f (diff) | |
| parent | 4d569ed1a3305c7b7abe8fa4273cea3b559cc85a (diff) | |
Merge branch 'master' of git+ssh://openadk.org/git/openadk
Conflicts:
BUGS
package/autoconf/Makefile
Diffstat (limited to 'toolchain/kernel-headers/patches/etrax-header.patch')
| -rw-r--r-- | toolchain/kernel-headers/patches/etrax-header.patch | 49 |
1 files changed, 27 insertions, 22 deletions
diff --git a/toolchain/kernel-headers/patches/etrax-header.patch b/toolchain/kernel-headers/patches/etrax-header.patch index fadcf5d53..3672cf60b 100644 --- a/toolchain/kernel-headers/patches/etrax-header.patch +++ b/toolchain/kernel-headers/patches/etrax-header.patch @@ -1,6 +1,6 @@ -diff -Nur linux-2.6.28.orig/arch/cris/include/arch-v10/arch/Kbuild linux-2.6.28/arch/cris/include/arch-v10/arch/Kbuild ---- linux-2.6.28.orig/arch/cris/include/arch-v10/arch/Kbuild 2008-12-25 00:26:37.000000000 +0100 -+++ linux-2.6.28/arch/cris/include/arch-v10/arch/Kbuild 2008-12-29 20:49:24.000000000 +0100 +diff -Nur linux-2.6.31.4.orig/arch/cris/include/arch-v10/arch/Kbuild linux-2.6.31.4/arch/cris/include/arch-v10/arch/Kbuild +--- linux-2.6.31.4.orig/arch/cris/include/arch-v10/arch/Kbuild 2009-10-12 22:15:40.000000000 +0200 ++++ linux-2.6.31.4/arch/cris/include/arch-v10/arch/Kbuild 2009-10-25 09:57:06.167232146 +0100 @@ -1,4 +1,9 @@ +header-y += dma.h +header-y += io_interface_mux.h @@ -11,9 +11,9 @@ diff -Nur linux-2.6.28.orig/arch/cris/include/arch-v10/arch/Kbuild linux-2.6.28/ +header-y += elf.h +header-y += page.h +header-y += ptrace.h -diff -Nur linux-2.6.28.orig/arch/cris/include/arch-v32/arch/Kbuild linux-2.6.28/arch/cris/include/arch-v32/arch/Kbuild ---- linux-2.6.28.orig/arch/cris/include/arch-v32/arch/Kbuild 2008-12-25 00:26:37.000000000 +0100 -+++ linux-2.6.28/arch/cris/include/arch-v32/arch/Kbuild 2008-12-29 20:48:51.000000000 +0100 +diff -Nur linux-2.6.31.4.orig/arch/cris/include/arch-v32/arch/Kbuild linux-2.6.31.4/arch/cris/include/arch-v32/arch/Kbuild +--- linux-2.6.31.4.orig/arch/cris/include/arch-v32/arch/Kbuild 2009-10-12 22:15:40.000000000 +0200 ++++ linux-2.6.31.4/arch/cris/include/arch-v32/arch/Kbuild 2009-10-25 09:57:06.167232146 +0100 @@ -1,2 +1,6 @@ header-y += user.h header-y += cryptocop.h @@ -21,9 +21,9 @@ diff -Nur linux-2.6.28.orig/arch/cris/include/arch-v32/arch/Kbuild linux-2.6.28/ +header-y += page.h +header-y += ptrace.h + -diff -Nur linux-2.6.28.orig/arch/cris/include/asm/Kbuild linux-2.6.28/arch/cris/include/asm/Kbuild ---- linux-2.6.28.orig/arch/cris/include/asm/Kbuild 2008-12-25 00:26:37.000000000 +0100 -+++ linux-2.6.28/arch/cris/include/asm/Kbuild 2008-12-29 20:48:51.000000000 +0100 +diff -Nur linux-2.6.31.4.orig/arch/cris/include/asm/Kbuild linux-2.6.31.4/arch/cris/include/asm/Kbuild +--- linux-2.6.31.4.orig/arch/cris/include/asm/Kbuild 2009-10-12 22:15:40.000000000 +0200 ++++ linux-2.6.31.4/arch/cris/include/asm/Kbuild 2009-10-25 09:57:06.167232146 +0100 @@ -1,11 +1,14 @@ include include/asm-generic/Kbuild.asm @@ -41,28 +41,33 @@ diff -Nur linux-2.6.28.orig/arch/cris/include/asm/Kbuild linux-2.6.28/arch/cris/ unifdef-y += etraxgpio.h unifdef-y += rs485.h -diff -Nur linux-2.6.28.orig/include/asm-generic/Kbuild linux-2.6.28/include/asm-generic/Kbuild ---- linux-2.6.28.orig/include/asm-generic/Kbuild 2008-12-25 00:26:37.000000000 +0100 -+++ linux-2.6.28/include/asm-generic/Kbuild 2008-12-29 20:48:51.000000000 +0100 -@@ -2,8 +2,10 @@ +diff -Nur linux-2.6.31.4.orig/include/asm-generic/Kbuild linux-2.6.31.4/include/asm-generic/Kbuild +--- linux-2.6.31.4.orig/include/asm-generic/Kbuild 2009-10-12 22:15:40.000000000 +0200 ++++ linux-2.6.31.4/include/asm-generic/Kbuild 2009-10-25 10:00:20.743354404 +0100 +@@ -3,12 +3,15 @@ + header-y += errno-base.h header-y += errno.h header-y += fcntl.h ++header-y += getorder.h header-y += ioctl.h + header-y += ioctls.h + header-y += ipcbuf.h +header-y += memory_model.h + header-y += mman-common.h header-y += mman.h - header-y += poll.h + header-y += msgbuf.h +header-y += page.h - header-y += signal.h - header-y += statfs.h - -diff -Nur linux-2.6.28.orig/include/linux/Kbuild linux-2.6.28/include/linux/Kbuild ---- linux-2.6.28.orig/include/linux/Kbuild 2008-12-25 00:26:37.000000000 +0100 -+++ linux-2.6.28/include/linux/Kbuild 2008-12-29 20:48:51.000000000 +0100 -@@ -158,6 +158,7 @@ + header-y += param.h + header-y += poll.h + header-y += posix_types.h +diff -Nur linux-2.6.31.4.orig/include/linux/Kbuild linux-2.6.31.4/include/linux/Kbuild +--- linux-2.6.31.4.orig/include/linux/Kbuild 2009-10-12 22:15:40.000000000 +0200 ++++ linux-2.6.31.4/include/linux/Kbuild 2009-10-25 09:57:06.207234174 +0100 +@@ -160,6 +160,7 @@ header-y += udf_fs_i.h header-y += ultrasound.h header-y += un.h +header-y += user.h header-y += utime.h header-y += veth.h - header-y += video_decoder.h + header-y += videotext.h |