[xserver-commit] xserver/hw/kdrive/linux linux.c,1.13,1.14

Phil Blundell xserver-commit@pdx.freedesktop.org
Tue, 28 Oct 2003 14:28:35 -0800


Committed by: pb

Update of /cvs/xserver/xserver/hw/kdrive/linux
In directory pdx:/tmp/cvs-serv3526

Modified Files:
	linux.c 
Log Message:
try /dev/misc/apm_bios if /dev/apm_bios doesn't exist



Index: linux.c
===================================================================
RCS file: /cvs/xserver/xserver/hw/kdrive/linux/linux.c,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- linux.c	14 Oct 2003 05:05:28 -0000	1.13
+++ linux.c	28 Oct 2003 22:28:33 -0000	1.14
@@ -337,6 +337,8 @@
      * Open the APM driver
      */
     LinuxApmFd = open ("/dev/apm_bios", 2);
+    if (LinuxApmFd < 0 && errno == ENOENT)
+	LinuxApmFd = open ("/dev/misc/apm_bios", 2); 
     if (LinuxApmFd >= 0)
     {
 	LinuxApmRunning = TRUE;