Merge branch 'master' into mpx

Conflicts:

	XTrap/xtrapddmi.c
	Xext/security.c
	Xext/xprint.c
	Xext/xtest.c
	Xext/xvdisp.c
	Xi/exevents.c
	Xi/grabdevb.c
	Xi/grabdevk.c
	Xi/opendev.c
	Xi/ungrdev.c
	Xi/ungrdevb.c
	Xi/ungrdevk.c
	dix/cursor.c
	dix/devices.c
	dix/dixutils.c
	dix/events.c
	dix/getevents.c
	dix/main.c
	dix/window.c
	hw/xfree86/ramdac/xf86Cursor.c
	include/dix.h
	include/input.h
	include/inputstr.h
	mi/midispcur.c
	mi/miinitext.c
	mi/misprite.c
	render/animcur.c
	xfixes/cursor.c
	xkb/xkbAccessX.c

1 files changed, 0 insertions, 5 deletions

diff --git a/include/extinit.h b/include/extinit.h
index d008651ce..d9964805e 100644
--- a/include/extinit.h
+++ b/include/extinit.h
@@ -49,9 +49,4 @@ AssignTypeAndName (
 	char *                 /* name */
 	);
 
-DeviceIntPtr
-LookupDeviceIntRec (
-	CARD8                  /* id */
-	);
-
 #endif /* EXTINIT_H */