aboutsummaryrefslogtreecommitdiff
path: root/xorg-server/hw/kdrive/src/kmap.c
diff options
context:
space:
mode:
authormarha <marha@users.sourceforge.net>2009-07-25 20:12:58 +0000
committermarha <marha@users.sourceforge.net>2009-07-25 20:12:58 +0000
commit2553bdd7c359cd87525d367761c86932cec5adff (patch)
treeae71245933c98474a699d3e392de5820879b2018 /xorg-server/hw/kdrive/src/kmap.c
parente2c51f2ee7b0a3ea1a052fc49324057b4a4bbc78 (diff)
parent4a3dbb926ae3f5410198d7cc4f4ebe4f62eebf05 (diff)
downloadvcxsrv-2553bdd7c359cd87525d367761c86932cec5adff.tar.gz
vcxsrv-2553bdd7c359cd87525d367761c86932cec5adff.tar.bz2
vcxsrv-2553bdd7c359cd87525d367761c86932cec5adff.zip
svn merge file:///D:/svnrepos/vcxsrv/branches/released .
Diffstat (limited to 'xorg-server/hw/kdrive/src/kmap.c')
-rw-r--r--xorg-server/hw/kdrive/src/kmap.c6
1 files changed, 0 insertions, 6 deletions
diff --git a/xorg-server/hw/kdrive/src/kmap.c b/xorg-server/hw/kdrive/src/kmap.c
index 0762e72af..a10c9ec09 100644
--- a/xorg-server/hw/kdrive/src/kmap.c
+++ b/xorg-server/hw/kdrive/src/kmap.c
@@ -82,9 +82,6 @@ KdMapDevice (CARD32 addr, CARD32 size)
strerror (errno));
return a;
#endif
-#ifdef VXWORKS
- return (void *) addr;
-#endif
}
void
@@ -97,9 +94,6 @@ KdUnmapDevice (void *addr, CARD32 size)
#ifdef linux
munmap (addr, size);
#endif
-#ifdef VXWORKS
- ;
-#endif
}
#ifdef HAVE_ASM_MTRR_H