diff options
| author | Kean Johnson <kean@armory.com> | 2005-06-10 06:54:08 +0000 |
|---|---|---|
| committer | Kean Johnson <kean@armory.com> | 2005-06-10 06:54:08 +0000 |
| commit | 6959958e41a5779b43cff7aadf68c6073c68e674 (patch) | |
| tree | 8ea1fb9633de92bbc0e5a53a7da26063752f4294 /hw/xfree86/os-support/bus | |
| parent | baa0cfc15442287557e44fa2614d89ab0b5c2539 (diff) | |
SCO port update for SCO OpenServer 5 and UnixWare 7. A few general cleanupssco_port_update
and bugs not specifically related to the port fixed along the way.
Diffstat (limited to 'hw/xfree86/os-support/bus')
| -rw-r--r-- | hw/xfree86/os-support/bus/axpPci.c | 2 | ||||
| -rw-r--r-- | hw/xfree86/os-support/bus/freebsdPci.c | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/hw/xfree86/os-support/bus/axpPci.c b/hw/xfree86/os-support/bus/axpPci.c index 04ff8b956..d218a0d2f 100644 --- a/hw/xfree86/os-support/bus/axpPci.c +++ b/hw/xfree86/os-support/bus/axpPci.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/bus/axpPci.c,v 1.15 2002/12/12 04:12:02 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/bus/axpPci.c,v 1.14 2002/12/11 02:44:28 dawes Exp $ */ /* * Copyright 1998 by Concurrent Computer Corporation * diff --git a/hw/xfree86/os-support/bus/freebsdPci.c b/hw/xfree86/os-support/bus/freebsdPci.c index c3e621daf..3b2bf5a9b 100644 --- a/hw/xfree86/os-support/bus/freebsdPci.c +++ b/hw/xfree86/os-support/bus/freebsdPci.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/bus/freebsdPci.c,v 1.5 2002/08/27 22:07:07 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/bus/freebsdPci.c,v 1.4 2002/07/24 19:06:52 tsi Exp $ */ /* * Copyright 1998 by Concurrent Computer Corporation * @@ -84,7 +84,7 @@ static pciBusInfo_t freebsdPci0 = { /* bridge */ NULL }; -#if !defined(__OpenBSD__) +#if !defined(__OpenBSD__) && !defined(__FreeBSD__) #if X_BYTE_ORDER == X_BIG_ENDIAN #ifdef __sparc__ #ifndef ASI_PL |