Index: xorg-server-1.6.3.901/hw/xfree86/os-support/linux/lnx_apm.c
===================================================================
--- xorg-server-1.6.3.901.orig/hw/xfree86/os-support/linux/lnx_apm.c
+++ xorg-server-1.6.3.901/hw/xfree86/os-support/linux/lnx_apm.c
@@ -189,7 +189,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;
     }