diff --git a/xserver/hw/xfree86/os-support/bsd/hp300_video.c b/xserver/hw/xfree86/os-support/bsd/hp300_video.c
index 5c1fdbd5a..83292e202 100644
--- a/xserver/hw/xfree86/os-support/bsd/hp300_video.c
+++ b/xserver/hw/xfree86/os-support/bsd/hp300_video.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: hp300_video.c,v 1.3 2008/02/16 21:40:29 miod Exp $	*/
+/* $OpenBSD: hp300_video.c,v 1.4 2012/06/16 15:08:08 matthieu Exp $	*/
 /*
  * Copyright 1992 by Rich Murphey <Rich@Rice.edu>
  * Copyright 1993 by David Wexelblat <dwex@goblin.org>
@@ -60,7 +60,7 @@ xf86OSInitVidMem(VidMemInfoPtr pVidMem)
 static pointer
 hp300MapVidMem(int ScreenNum, unsigned long Base, unsigned long Size, int flags)
 {
-	int fd = xf86Info.screenFd;
+	int fd = xf86Info.consoleFd;
 	pointer base;
 
 #ifdef DEBUG
diff --git a/xserver/hw/xfree86/os-support/bsd/hppa_video.c b/xserver/hw/xfree86/os-support/bsd/hppa_video.c
index 58dd506b8..111eec527 100644
--- a/xserver/hw/xfree86/os-support/bsd/hppa_video.c
+++ b/xserver/hw/xfree86/os-support/bsd/hppa_video.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: hppa_video.c,v 1.6 2012/06/10 13:21:25 matthieu Exp $ */
+/* $OpenBSD: hppa_video.c,v 1.7 2012/06/16 15:08:08 matthieu Exp $ */
 /*
  * Copyright 1992 by Rich Murphey <Rich@Rice.edu>
  * Copyright 1993 by David Wexelblat <dwex@goblin.org>
@@ -57,7 +57,7 @@ xf86OSInitVidMem(VidMemInfoPtr pVidMem)
 	pVidMem->mapMem = hppaMapVidMem;
 	pVidMem->unmapMem = hppaUnmapVidMem;
 #if HAVE_PCI_SYSTEM_INIT_DEV_MEM
-       pci_system_init_dev_mem(xf86Info.screenFd);
+       pci_system_init_dev_mem(xf86Info.consoleFd);
 #endif
 	pVidMem->initialised = TRUE;
 }
@@ -68,7 +68,7 @@ volatile unsigned char *ioBase = MAP_FAILED;
 static pointer
 hppaMapVidMem(int ScreenNum, unsigned long Base, unsigned long Size, int flags)
 {
-	int fd = xf86Info.screenFd;
+	int fd = xf86Info.consoleFd;
 	pointer base;
 
 #ifdef DEBUG
diff --git a/xserver/hw/xfree86/os-support/bsd/sgi_video.c b/xserver/hw/xfree86/os-support/bsd/sgi_video.c
index 3e34dda44..66d3d5f3b 100644
--- a/xserver/hw/xfree86/os-support/bsd/sgi_video.c
+++ b/xserver/hw/xfree86/os-support/bsd/sgi_video.c
@@ -58,7 +58,7 @@ static pointer
 sgiMapVidMem(int ScreenNum, unsigned long Base, unsigned long Size, 
 		 int flags)
 {
-	int fd = xf86Info.screenFd;
+	int fd = xf86Info.consoleFd;
 	pointer base;
 
 #ifdef DEBUG