summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTim Yamin <plasmaroo@gentoo.org>2003-12-25 16:09:22 +0000
committerTim Yamin <plasmaroo@gentoo.org>2003-12-25 16:09:22 +0000
commita51505f5c9c72536d842f9d523cf4e44ec35ae3b (patch)
tree0e62983187356129c5fbfb2693d450bff1977dcc /sys-kernel/linux-headers
parentNo longer available on CPAN (diff)
downloadhistorical-a51505f5c9c72536d842f9d523cf4e44ec35ae3b.tar.gz
historical-a51505f5c9c72536d842f9d523cf4e44ec35ae3b.tar.bz2
historical-a51505f5c9c72536d842f9d523cf4e44ec35ae3b.zip
Fixed a problem with the last component of the compatibility patch getting
ignored.
Diffstat (limited to 'sys-kernel/linux-headers')
-rw-r--r--sys-kernel/linux-headers/files/linux-headers-2.6.0-appCompat.patch15
1 files changed, 8 insertions, 7 deletions
diff --git a/sys-kernel/linux-headers/files/linux-headers-2.6.0-appCompat.patch b/sys-kernel/linux-headers/files/linux-headers-2.6.0-appCompat.patch
index c7d4fc43e8b2..1bb5158b58a7 100644
--- a/sys-kernel/linux-headers/files/linux-headers-2.6.0-appCompat.patch
+++ b/sys-kernel/linux-headers/files/linux-headers-2.6.0-appCompat.patch
@@ -64,7 +64,7 @@ diff -Naur linux-2.6.0/include/linux/fs.h linux-2.6.0/include/linux.plasmaroo/fs
-#include <linux/radix-tree.h>
+
+/* This should fix any ``sys-fs'' items getting spinlocks.
-+ $Header: /var/cvsroot/gentoo-x86/sys-kernel/linux-headers/files/linux-headers-2.6.0-appCompat.patch,v 1.3 2003/12/24 22:09:07 plasmaroo Exp $
++ $Header: /var/cvsroot/gentoo-x86/sys-kernel/linux-headers/files/linux-headers-2.6.0-appCompat.patch,v 1.4 2003/12/25 16:09:22 plasmaroo Exp $
+*/
+
+#ifdef __KERNEL__
@@ -84,7 +84,7 @@ diff -Naur linux-2.6.0/include/linux/isdn.h linux-2.6.0/include/linux.plasmaroo/
-#include <linux/isdn/fsm.h>
+
+/* This should sort out ``ligtop'' from getting spinlocks.
-+ $Header: /var/cvsroot/gentoo-x86/sys-kernel/linux-headers/files/linux-headers-2.6.0-appCompat.patch,v 1.3 2003/12/24 22:09:07 plasmaroo Exp $
++ $Header: /var/cvsroot/gentoo-x86/sys-kernel/linux-headers/files/linux-headers-2.6.0-appCompat.patch,v 1.4 2003/12/25 16:09:22 plasmaroo Exp $
+*/
+#ifdef __KERNEL__
+ #include <linux/isdn/fsm.h>
@@ -102,7 +102,7 @@ diff -Naur linux-2.6.0/include/linux/msdos_fs.h linux-2.6.0/include/linux.plasma
-#include <linux/buffer_head.h>
+
+/* This should sort out any problems with ``dosfstools''.
-+ $Header: /var/cvsroot/gentoo-x86/sys-kernel/linux-headers/files/linux-headers-2.6.0-appCompat.patch,v 1.3 2003/12/24 22:09:07 plasmaroo Exp $
++ $Header: /var/cvsroot/gentoo-x86/sys-kernel/linux-headers/files/linux-headers-2.6.0-appCompat.patch,v 1.4 2003/12/25 16:09:22 plasmaroo Exp $
+*/
+#ifdef __KERNEL__
+ #include <linux/buffer_head.h>
@@ -220,7 +220,7 @@ diff -Naur linux-2.6.0/include/linux/videodev.h linux-2.6.0/include/linux.plasma
-#include <linux/device.h>
+
+/* Should sort out ``DirectFB''.
-+ $Header: /var/cvsroot/gentoo-x86/sys-kernel/linux-headers/files/linux-headers-2.6.0-appCompat.patch,v 1.3 2003/12/24 22:09:07 plasmaroo Exp $
++ $Header: /var/cvsroot/gentoo-x86/sys-kernel/linux-headers/files/linux-headers-2.6.0-appCompat.patch,v 1.4 2003/12/25 16:09:22 plasmaroo Exp $
+*/
+#ifdef __KERNEL__
+ #include <linux/device.h>
@@ -229,8 +229,10 @@ diff -Naur linux-2.6.0/include/linux/videodev.h linux-2.6.0/include/linux.plasma
#define HAVE_V4L2 1
#include <linux/videodev2.h>
diff -Naur linux-2.6.0/include/linux/mod_devicetable.h linux-2.6.0/include/linux.plasmaroo/mod_devicetable.h
---- linux-2.6.0/include/linux/mod_devicetable.h 2003-07-10 21:15:03.000000000 +0100
-+++ linux-2.6.0/include/linux.plasmaroo/mod_devicetable.h 2003-12-24 21:55:50.000000000 +0000
+--- linux-2.6.0/include/linux/mod_devicetable.h 2003-12-18 02:59:53.000000000 +0000
++++ linux-2.6.0/include/linux.plasmaroo/mod_devicetable.h 2003-12-25 16:00:21.000000000 +0000
+@@ -9,8 +9,10 @@
+
#ifdef __KERNEL__
#include <linux/types.h>
-typedef unsigned long kernel_ulong_t;
@@ -241,4 +243,3 @@ diff -Naur linux-2.6.0/include/linux/mod_devicetable.h linux-2.6.0/include/linux
#define PCI_ANY_ID (~0)
-