diff -urp xorg-server-1.1.99.901/hw/xfree86/os-support/linux/lnx_apm.c ../xorg-server-1.1.99.901/hw/xfree86/os-support/linux/lnx_apm.c
--- xorg-server-1.1.99.901/hw/xfree86/os-support/linux/lnx_apm.c	2006-10-12 00:42:19.000000000 +0200
+++ ../xorg-server-1.1.99.901/hw/xfree86/os-support/linux/lnx_apm.c	2006-11-20 11:50:46.000000000 +0100
@@ -180,7 +180,7 @@ lnxAPMOpen(void)
 	    close(pfd);
 	xf86PMGetEventFromOs = lnxPMGetEventFromOs;
 	xf86PMConfirmEventToOs = lnxPMConfirmEventToOs;
-	APMihPtr = xf86AddInputHandler(fd,xf86HandlePMEvents,NULL);
+	APMihPtr = xf86AddGeneralHandler(fd,xf86HandlePMEvents,NULL);
 	xf86MsgVerb(X_INFO,3,"Open APM successful\n");
 	return lnxCloseAPM;
     }