@ -0,0 +1,21 @@ |
|||||
|
--- xc/programs/Xserver/hw/xfree86/os-support/bus/linuxPci.c.orig 2004-08-22 23:09:02.000000000 +0200
|
||||
|
+++ xc/programs/Xserver/hw/xfree86/os-support/bus/linuxPci.c 2004-08-22 23:10:51.000000000 +0200
|
||||
|
@@ -196,6 +196,8 @@
|
||||
|
* master aborts are avoided during PCI scans). |
||||
|
*/ |
||||
|
|
||||
|
+#include <asm/types.h>
|
||||
|
+typedef unsigned long kernel_ulong_t;
|
||||
|
#include <linux/pci.h> |
||||
|
|
||||
|
#ifndef PCIIOC_BASE /* Ioctls for /proc/bus/pci/X/Y nodes. */ |
||||
|
--- xc/programs/Xserver/hw/xfree86/os-support/bus/xf86Sbus.h.orig 2004-08-22 23:15:10.000000000 +0200
|
||||
|
+++ xc/programs/Xserver/hw/xfree86/os-support/bus/xf86Sbus.h 2004-08-22 23:15:25.000000000 +0200
|
||||
|
@@ -27,6 +27,7 @@
|
||||
|
|
||||
|
#if defined(linux) |
||||
|
#include <asm/types.h> |
||||
|
+#include <linux/fb.h>
|
||||
|
#include <asm/fbio.h> |
||||
|
#include <asm/openpromio.h> |
||||
|
#elif defined(SVR4) |
@ -0,0 +1,22 @@ |
|||||
|
--- xc/programs/Xserver/hw/xfree86/os-support/linux/lnx_kbd.c~ 2004-08-21 16:22:07.000000000 +0200
|
||||
|
+++ xc/programs/Xserver/hw/xfree86/os-support/linux/lnx_kbd.c 2004-08-21 19:54:02.000000000 +0200
|
||||
|
@@ -102,7 +102,7 @@
|
||||
|
|
||||
|
/* Deal with spurious kernel header change */ |
||||
|
#if defined(LINUX_VERSION_CODE) && defined(KERNEL_VERSION) |
||||
|
-# if LINUX_VERSION_CODE >= KERNEL_VERSION(2,5,42)
|
||||
|
+# if LINUX_VERSION_CODE >= KERNEL_VERSION(2,5,42) && !defined(__sparc__)
|
||||
|
# define rate period |
||||
|
# endif |
||||
|
#endif |
||||
|
--- xc/programs/Xserver/hw/xfree86/os-support/linux/lnx_io.c~ 2004-08-21 16:22:07.000000000 +0200
|
||||
|
+++ xc/programs/Xserver/hw/xfree86/os-support/linux/lnx_io.c 2004-08-21 19:53:22.000000000 +0200
|
||||
|
@@ -75,7 +75,7 @@
|
||||
|
|
||||
|
/* Deal with spurious kernel header change */ |
||||
|
#if defined(LINUX_VERSION_CODE) && defined(KERNEL_VERSION) |
||||
|
-# if LINUX_VERSION_CODE >= KERNEL_VERSION(2,5,42)
|
||||
|
+# if LINUX_VERSION_CODE >= KERNEL_VERSION(2,5,42) && !defined(__sparc__)
|
||||
|
# define rate period |
||||
|
# endif |
||||
|
#endif |