xserver: Branch 'master'
Adam Jackson
ajax at kemper.freedesktop.org
Mon Jun 18 09:20:52 PDT 2007
hw/xfree86/common/xf86Bus.c | 2 +-
hw/xfree86/os-support/linux/lnx_video.c | 5 +++--
hw/xfree86/os-support/misc/SlowBcopy.c | 3 ++-
3 files changed, 6 insertions(+), 4 deletions(-)
New commits:
diff-tree 831d3b7f8d053aba649c8d04af3bef96376bdc3a (from 562ca3f2f9005e7c5ed0a24b0759051ded2173e9)
Author: Lennart Buytenhek <buytenh at wantstofly.org>
Date: Mon Jun 18 12:05:55 2007 -0400
Compile fixes for Linux ARM platforms.
diff --git a/hw/xfree86/common/xf86Bus.c b/hw/xfree86/common/xf86Bus.c
index 9740b07..cd309a5 100644
--- a/hw/xfree86/common/xf86Bus.c
+++ b/hw/xfree86/common/xf86Bus.c
@@ -3004,7 +3004,7 @@ xf86FindPrimaryDevice()
}
-#if !defined(__sparc) && !defined(__sparc__) && !defined(__powerpc__) && !defined(__mips__)
+#if !defined(__sparc) && !defined(__sparc__) && !defined(__powerpc__) && !defined(__mips__) && !defined(__arm__)
#include "vgaHW.h"
#include "compiler.h"
#endif
diff --git a/hw/xfree86/os-support/linux/lnx_video.c b/hw/xfree86/os-support/linux/lnx_video.c
index 02a1310..a816560 100644
--- a/hw/xfree86/os-support/linux/lnx_video.c
+++ b/hw/xfree86/os-support/linux/lnx_video.c
@@ -62,7 +62,8 @@ static Bool ExtendedEnabled = FALSE;
#elif !defined(__powerpc__) && \
!defined(__mc68000__) && \
!defined(__sparc__) && \
- !defined(__mips__)
+ !defined(__mips__) && \
+ !defined(__arm__)
/*
* Due to conflicts with "compiler.h", don't rely on <sys/io.h> to declare
@@ -567,7 +568,7 @@ xf86EnableIO(void)
#endif
}
close(fd);
-#elif !defined(__mc68000__) && !defined(__sparc__) && !defined(__mips__) && !defined(__sh__) && !defined(__hppa__) && !defined(__s390__)
+#elif !defined(__mc68000__) && !defined(__sparc__) && !defined(__mips__) && !defined(__sh__) && !defined(__hppa__) && !defined(__s390__) && !defined(__arm__)
if (ioperm(0, 1024, 1) || iopl(3)) {
if (errno == ENODEV)
ErrorF("xf86EnableIOPorts: no I/O ports found\n");
diff --git a/hw/xfree86/os-support/misc/SlowBcopy.c b/hw/xfree86/os-support/misc/SlowBcopy.c
index 1fda7fc..f0ad611 100644
--- a/hw/xfree86/os-support/misc/SlowBcopy.c
+++ b/hw/xfree86/os-support/misc/SlowBcopy.c
@@ -35,7 +35,8 @@ xf86SlowBcopy(unsigned char *src, unsign
#if !defined(__sparc__) && \
!defined(__powerpc__) && \
!defined(__mips__) && \
- !defined(__ia64__)
+ !defined(__ia64__) && \
+ !defined(__arm__)
outb(0x80, 0x00);
#endif
}
More information about the xorg-commit
mailing list