diff options
| author | Matthieu Herrb <matthieu@cvs.openbsd.org> | 2007-12-03 12:45:11 +0000 |
|---|---|---|
| committer | Matthieu Herrb <matthieu@cvs.openbsd.org> | 2007-12-03 12:45:11 +0000 |
| commit | 4cf0e964a4f4722f227e1abc2b113f4d42b170b7 (patch) | |
| tree | 4c26d628b54500f8bee32832f8837710ccca42bf /xserver | |
| parent | e99f997f09a90787b2c6c62c95e362635adba565 (diff) | |
Revert xf86EnableIO()/xf86DisableIO() on macpcc to NOP for now.
Diffstat (limited to 'xserver')
| -rw-r--r-- | xserver/hw/xfree86/os-support/bsd/Makefile.am | 3 | ||||
| -rw-r--r-- | xserver/hw/xfree86/os-support/bsd/ppc_video.c | 4 |
2 files changed, 6 insertions, 1 deletions
diff --git a/xserver/hw/xfree86/os-support/bsd/Makefile.am b/xserver/hw/xfree86/os-support/bsd/Makefile.am index f4e3f4c11..b7bbbdcaa 100644 --- a/xserver/hw/xfree86/os-support/bsd/Makefile.am +++ b/xserver/hw/xfree86/os-support/bsd/Makefile.am @@ -55,7 +55,8 @@ ARCH_SOURCES = i386_video.c endif if PPC_VIDEO -ARCH_SOURCES = ppc_video.c +ARCH_SOURCES = ppc_video.c \ + $(srcdir)/../shared/ioperm_noop.c endif if SPARC64_VIDEO diff --git a/xserver/hw/xfree86/os-support/bsd/ppc_video.c b/xserver/hw/xfree86/os-support/bsd/ppc_video.c index 4a84f9673..109359507 100644 --- a/xserver/hw/xfree86/os-support/bsd/ppc_video.c +++ b/xserver/hw/xfree86/os-support/bsd/ppc_video.c @@ -54,8 +54,10 @@ static pointer ppcMapVidMem(int, unsigned long, unsigned long, int flags); static void ppcUnmapVidMem(int, pointer, unsigned long); +#ifdef __NetBSD__ Bool xf86EnableIO(void); void xf86DisableIO(void); +#endif void xf86OSInitVidMem(VidMemInfoPtr pVidMem) @@ -165,6 +167,7 @@ xf86PrivilegedInit(void) } #endif +#ifdef __NetBSD__ Bool xf86EnableIO() { int fd = xf86Info.screenFd; @@ -193,3 +196,4 @@ void xf86DisableIO() } } +#endif /* __NetBSD__ */ |