summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Januszewski <spock@gentoo.org>2004-01-22 18:35:44 +0000
committerMichael Januszewski <spock@gentoo.org>2004-01-22 18:35:44 +0000
commit476ba469146d7acd9bf41d9775cc47b74b7acc9b (patch)
treef1a8bcc74d472741aa6061684dd16892a69882ae /sys-kernel/linux-headers
parentAdded ~ppc keyword, fix gtk deps (diff)
downloadgentoo-2-476ba469146d7acd9bf41d9775cc47b74b7acc9b.tar.gz
gentoo-2-476ba469146d7acd9bf41d9775cc47b74b7acc9b.tar.bz2
gentoo-2-476ba469146d7acd9bf41d9775cc47b74b7acc9b.zip
Added a fix for linux/fb.h.
Diffstat (limited to 'sys-kernel/linux-headers')
-rw-r--r--sys-kernel/linux-headers/ChangeLog6
-rw-r--r--sys-kernel/linux-headers/files/linux-headers-2.6.0-fb.patch11
-rw-r--r--sys-kernel/linux-headers/linux-headers-2.6.0.ebuild3
3 files changed, 18 insertions, 2 deletions
diff --git a/sys-kernel/linux-headers/ChangeLog b/sys-kernel/linux-headers/ChangeLog
index 85f83ab6d595..139d32eabd8a 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-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/linux-headers/ChangeLog,v 1.39 2004/01/16 13:05:07 darkspecter Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/linux-headers/ChangeLog,v 1.40 2004/01/22 18:35:44 spock Exp $
+
+ 22 Jan 2004; Michal 'Spock' Januszewski <spock@gentoo.org>
+ linux-headers-2.6.0.ebuild, files/linux-headers-2.6.0-fb.patch:
+ Added a fix for linux/fb.h. This should close bugs #38737 and #38603.
16 Jan 2004; Bartosch Pixa <darkspecter@gentoo.org>
linux-headers-2.4.22.ebuild:
diff --git a/sys-kernel/linux-headers/files/linux-headers-2.6.0-fb.patch b/sys-kernel/linux-headers/files/linux-headers-2.6.0-fb.patch
new file mode 100644
index 000000000000..398240a6390e
--- /dev/null
+++ b/sys-kernel/linux-headers/files/linux-headers-2.6.0-fb.patch
@@ -0,0 +1,11 @@
+diff -Naur linux-2.6.0-orig/include/linux/fb.h linux-2.6.0/include/linux/fb.h
+--- linux-2.6.0-orig/include/linux/fb.h 2003-12-18 03:58:39.000000000 +0100
++++ linux-2.6.0/include/linux/fb.h 2004-01-22 19:12:10.765346576 +0100
+@@ -5,6 +5,7 @@
+ #include <linux/workqueue.h>
+ #include <asm/types.h>
+ #include <asm/io.h>
++#include <asm/atomic.h>
+
+ /* Definitions of frame buffers */
+
diff --git a/sys-kernel/linux-headers/linux-headers-2.6.0.ebuild b/sys-kernel/linux-headers/linux-headers-2.6.0.ebuild
index 8a4b5345302d..33d7b402783f 100644
--- a/sys-kernel/linux-headers/linux-headers-2.6.0.ebuild
+++ b/sys-kernel/linux-headers/linux-headers-2.6.0.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2004 Gentoo Technologies, Inc.
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/linux-headers/linux-headers-2.6.0.ebuild,v 1.4 2004/01/08 07:04:10 iggy Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/linux-headers/linux-headers-2.6.0.ebuild,v 1.5 2004/01/22 18:35:44 spock Exp $
ETYPE="headers"
inherit kernel
@@ -47,6 +47,7 @@ src_unpack() {
epatch ${FILESDIR}/${P}-appCompat.patch
epatch ${FILESDIR}/${P}-strict-ansi-fix.patch
epatch ${FILESDIR}/${P}-sysctl_h-compat.patch
+ epatch ${FILESDIR}/${P}-fb.patch
}