diff options
| author |   Tim Yamin <plasmaroo@gentoo.org> | 2005-04-18 22:00:05 +0000 |
|---|---|---|
| committer | Tim Yamin <plasmaroo@gentoo.org> | 2005-04-18 22:00:05 +0000 |
| commit | 435f1fdb805d9e15b42d04160294c94b94b3793e (patch) | |
| tree | 74a43e121ecea60c5eb3dd53df223eca1fb21c81 /sys-kernel/linux-headers | |
| parent | Stable on alpha, bug 88742. (diff) | |
| download | gentoo-2-435f1fdb805d9e15b42d04160294c94b94b3793e.tar.gz gentoo-2-435f1fdb805d9e15b42d04160294c94b94b3793e.tar.bz2 gentoo-2-435f1fdb805d9e15b42d04160294c94b94b3793e.zip | |
Fix #82690.
(Portage version: 2.0.51.19)
Diffstat (limited to 'sys-kernel/linux-headers')
| -rw-r--r-- | sys-kernel/linux-headers/ChangeLog | 6 | ||||
| -rw-r--r-- | sys-kernel/linux-headers/files/linux-headers-2.6.11-appCompat.patch | 9 |
2 files changed, 12 insertions, 3 deletions
diff --git a/sys-kernel/linux-headers/ChangeLog b/sys-kernel/linux-headers/ChangeLog index 433e6a6589a2..c18bd929ffca 100644 --- a/sys-kernel/linux-headers/ChangeLog +++ b/sys-kernel/linux-headers/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for sys-kernel/linux-headers # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-kernel/linux-headers/ChangeLog,v 1.114 2005/04/14 17:10:59 plasmaroo Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-kernel/linux-headers/ChangeLog,v 1.115 2005/04/18 22:00:04 plasmaroo Exp $ + + 18 Apr 2005; <plasmaroo@gentoo.org> + files/linux-headers-2.6.11-appCompat.patch: + Fix #82690. 14 Apr 2005; <plasmaroo@gentoo.org> files/linux-headers-2.6.11-appCompat.patch: diff --git a/sys-kernel/linux-headers/files/linux-headers-2.6.11-appCompat.patch b/sys-kernel/linux-headers/files/linux-headers-2.6.11-appCompat.patch index 968eff965bb6..6db0ceb1c4d7 100644 --- a/sys-kernel/linux-headers/files/linux-headers-2.6.11-appCompat.patch +++ b/sys-kernel/linux-headers/files/linux-headers-2.6.11-appCompat.patch @@ -2023,12 +2023,17 @@ diff -urp linux-2.6.10/include/linux/types.h linux-2.6.10-gentoo/include/linux/t diff -urp linux-2.6.10/include/asm-i386/thread_info.h linux-2.6.10-gentoo/include/asm-i386/thread_info.h --- linux-2.6.10/include/asm-i386/thread_info.h 2005-02-08 21:30:49.000000000 +0000 +++ linux-2.6.10-gentoo/asm-i386/thread_info.h 2005-02-08 21:27:03.000000000 +0000 -@@ -7,8 +7,6 @@ +@@ -7,8 +7,12 @@ #ifndef _ASM_THREAD_INFO_H #define _ASM_THREAD_INFO_H -#ifdef __KERNEL__ -- ++/* Fix bad upstream jojo in XEmacs; bug #82690. Temporary fix only warning until upstream fixes ++ things... */ ++#ifdef register ++#undef register ++#endif + #include <linux/config.h> #include <linux/compiler.h> #include <asm/page.h> |