diff --git a/hw/xfree86/os-support/xf86OSpriv.h b/hw/xfree86/os-support/xf86OSpriv.h deleted file mode 100644 index 1210bafe1..000000000 --- a/hw/xfree86/os-support/xf86OSpriv.h +++ /dev/null @@ -1,39 +0,0 @@ -/* - * Copyright (c) 1999-2000 by The XFree86 Project, Inc. - * - * Permission is hereby granted, free of charge, to any person obtaining a - * copy of this software and associated documentation files (the "Software"), - * to deal in the Software without restriction, including without limitation - * the rights to use, copy, modify, merge, publish, distribute, sublicense, - * and/or sell copies of the Software, and to permit persons to whom the - * Software is furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in - * all copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL - * THE COPYRIGHT HOLDER(S) OR AUTHOR(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR - * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, - * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR - * OTHER DEALINGS IN THE SOFTWARE. - * - * Except as contained in this notice, the name of the copyright holder(s) - * and author(s) shall not be used in advertising or otherwise to promote - * the sale, use or other dealings in this Software without prior written - * authorization from the copyright holder(s) and author(s). - */ - -#ifdef HAVE_XORG_CONFIG_H -#include -#endif - -#ifndef _XF86OSPRIV_H -#define _XF86OSPRIV_H - -typedef struct { - Bool initialised; -} VidMemInfo, *VidMemInfoPtr; - -#endif /* _XF86OSPRIV_H */ diff --git a/hw/xfree86/os-support/xf86_os_support.h b/hw/xfree86/os-support/xf86_os_support.h index ccb163005..a9c1861ac 100644 --- a/hw/xfree86/os-support/xf86_os_support.h +++ b/hw/xfree86/os-support/xf86_os_support.h @@ -10,8 +10,6 @@ #include -#include "xf86OSpriv.h" - typedef void (*PMClose) (void); void xf86OpenConsole(void); @@ -31,6 +29,10 @@ void xf86OSInputThreadInit(void); Bool xf86DeallocateGARTMemory(int screenNum, int key); int xf86RemoveSIGIOHandler(int fd); +typedef struct { + Bool initialised; +} VidMemInfo, *VidMemInfoPtr; + void xf86OSInitVidMem(VidMemInfoPtr); #endif /* _XSERVER_XF86_OS_SUPPORT */