diff options
Diffstat (limited to 'xc/programs/Xserver/hw/xfree86/os-support/bsd/bsdResource.c')
| -rw-r--r-- | xc/programs/Xserver/hw/xfree86/os-support/bsd/bsdResource.c | 23 |
1 files changed, 17 insertions, 6 deletions
diff --git a/xc/programs/Xserver/hw/xfree86/os-support/bsd/bsdResource.c b/xc/programs/Xserver/hw/xfree86/os-support/bsd/bsdResource.c index c19751bed..f999561cf 100644 --- a/xc/programs/Xserver/hw/xfree86/os-support/bsd/bsdResource.c +++ b/xc/programs/Xserver/hw/xfree86/os-support/bsd/bsdResource.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/bsd/bsdResource.c,v 1.6 2001/02/16 14:45:10 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/bsd/bsdResource.c,v 1.8 2002/05/22 21:38:29 herrb Exp $ */ /* Resource information code */ @@ -11,12 +11,15 @@ #define NEED_OS_RAC_PROTOS #include "xf86_OSlib.h" -#ifdef __alpha__ - -#include <sys/sysctl.h> +/* Avoid Imakefile changes */ +#include "bus/Pci.h" resRange PciAvoid[] = {_PCI_AVOID_PC_STYLE, _END}; +#ifdef INCLUDE_XF86_NO_DOMAIN + +#if defined(__alpha__) || defined(__sparc64__) + resPtr xf86BusAccWindowsFromOS(void) { @@ -52,6 +55,8 @@ xf86PciBusAccWindowsFromOS(void) return ret; } +#ifdef INCLUDE_UNUSED + resPtr xf86IsaBusAccWindowsFromOS(void) { @@ -66,6 +71,8 @@ xf86IsaBusAccWindowsFromOS(void) return ret; } +#endif /* INCLUDE_UNUSED */ + resPtr xf86AccResFromOS(resPtr ret) { @@ -107,8 +114,6 @@ xf86AccResFromOS(resPtr ret) #elif defined(__powerpc__) -resRange PciAvoid[] = {_PCI_AVOID_PC_STYLE, _END}; - resPtr xf86BusAccWindowsFromOS(void) { @@ -137,6 +142,8 @@ xf86PciBusAccWindowsFromOS(void) return ret; } +#ifdef INCLUDE_UNUSED + resPtr xf86IsaBusAccWindowsFromOS(void) { @@ -151,6 +158,8 @@ xf86IsaBusAccWindowsFromOS(void) return ret; } +#endif /* INCLUDE_UNUSED */ + resPtr xf86AccResFromOS(resPtr ret) { @@ -177,3 +186,5 @@ xf86AccResFromOS(resPtr ret) #error : Put your platform dependent code here!! #endif + +#endif /* INCLUDE_XF86_NO_DOMAIN */ |