summaryrefslogtreecommitdiff
path: root/hw/xfree86/os-support/linux
diff options
context:
space:
mode:
authorJulien Cristau <jcristau@debian.org>2007-07-19 20:37:26 -0400
committerDavid Nusinow <dnusinow@debian.org>2007-07-19 20:37:26 -0400
commit0f91abd5c68eb044d09733d18ef0f6b8ed128200 (patch)
tree32c34c753e4ea59029bb6a6ed340ac74ca3f4415 /hw/xfree86/os-support/linux
parentdc9c5196282ba61bd542e198dfe0d53d93181591 (diff)
Fix alpha build failures
Don't include <asm/pci.h> in os-support/linux/lnx_axp.c, use "lnx.h" and <unistd.h> instead
Diffstat (limited to 'hw/xfree86/os-support/linux')
-rw-r--r--hw/xfree86/os-support/linux/lnx.h1
-rw-r--r--hw/xfree86/os-support/linux/lnx_axp.c4
2 files changed, 2 insertions, 3 deletions
diff --git a/hw/xfree86/os-support/linux/lnx.h b/hw/xfree86/os-support/linux/lnx.h
index 5aca9e9b1..085c94265 100644
--- a/hw/xfree86/os-support/linux/lnx.h
+++ b/hw/xfree86/os-support/linux/lnx.h
@@ -11,7 +11,6 @@ extern int iopl __P ((int __level));
/* new pciconfig_iobase syscall added in 2.2.15 and 2.3.99 */
# include <linux/unistd.h>
-# include <asm/pci.h>
extern long (*_iobase)(unsigned, int, int, int);
/*
diff --git a/hw/xfree86/os-support/linux/lnx_axp.c b/hw/xfree86/os-support/linux/lnx_axp.c
index 0a7612965..e255118cc 100644
--- a/hw/xfree86/os-support/linux/lnx_axp.c
+++ b/hw/xfree86/os-support/linux/lnx_axp.c
@@ -112,8 +112,8 @@ lnxGetAXP(void)
/*
* pciconfig_iobase wrappers and dynamic i/o selection
*/
-#include <linux/unistd.h>
-#include <asm/pci.h>
+#include "lnx.h"
+#include <unistd.h>
#include <errno.h>
/* glibc versions (single hose only) */