diff options
author | Eamon Walsh <ewalsh@tycho.nsa.gov> | 2006-08-21 18:49:31 -0400 |
---|---|---|
committer | Eamon Walsh <ewalsh@moss-uranus.epoch.ncsc.mil> | 2006-08-21 18:49:31 -0400 |
commit | 52ba722e4c89c052609b4fc62e965d92778aa2dd (patch) | |
tree | cd5b5bd1257c08278b051221dc8f6f7041ec6036 /hw/xfree86/os-support/linux/lnx_agp.c | |
parent | 9138d5a51e411f598bc0e75a3e73d2c16187a518 (diff) | |
parent | 05541259bdb0dfaab015a01caa3722b7a1b782e2 (diff) |
Merge branch 'XACE-modular' into my-XACE-modular
Diffstat (limited to 'hw/xfree86/os-support/linux/lnx_agp.c')
-rw-r--r-- | hw/xfree86/os-support/linux/lnx_agp.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/hw/xfree86/os-support/linux/lnx_agp.c b/hw/xfree86/os-support/linux/lnx_agp.c index 65a5a0ea3..ded9e0fae 100644 --- a/hw/xfree86/os-support/linux/lnx_agp.c +++ b/hw/xfree86/os-support/linux/lnx_agp.c @@ -1,13 +1,12 @@ /* * Abstraction of the AGP GART interface. * - * This version is for both Linux and FreeBSD. + * This version is for Linux and Free/Open/NetBSD. * * Copyright © 2000 VA Linux Systems, Inc. * Copyright © 2001 The XFree86 Project, Inc. */ -/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/linux/lnx_agp.c,v 3.11 2003/04/03 22:47:42 dawes Exp $ */ #ifdef HAVE_XORG_CONFIG_H #include <xorg-config.h> @@ -264,7 +263,11 @@ xf86DeallocateGARTMemory(int screenNum, int key) return FALSE; } +#ifdef __linux__ if (ioctl(gartFd, AGPIOC_DEALLOCATE, (int *)key) != 0) { +#else + if (ioctl(gartFd, AGPIOC_DEALLOCATE, &key) != 0) { +#endif xf86DrvMsg(screenNum, X_WARNING,"xf86DeAllocateGARTMemory: " "deallocation gart memory with key %d failed\n\t(%s)\n", key, strerror(errno)); |