--- src/sys/dev/drm/Attic/drm_drv.h	2004/09/18 16:25:54	1.10
+++ src/sys/dev/drm/Attic/drm_drv.h	2005/03/01 00:43:02	1.11
@@ -1144,10 +1144,9 @@ MODULE_DEPEND(DRIVER_NAME, linux, 1, 1,
 #define LINUX_IOCTL_DRM_MIN		0x6400
 #define LINUX_IOCTL_DRM_MAX		0x64ff
 
-static ioctl_map_func DRM(ioctl_dirmap);
 static struct ioctl_map_range DRM(ioctl_cmds)[] = {
-	/* XXX: we should have a BSD #define for the range */
-	MAPPED_IOCTL_MAPRANGE(LINUX_IOCTL_DRM_MIN, LINUX_IOCTL_DRM_MAX, LINUX_IOCTL_DRM_MIN, DRM(ioctl_dirmap)),
+	MAPPED_IOCTL_MAPRANGE(LINUX_IOCTL_DRM_MIN, LINUX_IOCTL_DRM_MAX, LINUX_IOCTL_DRM_MIN,
+			      LINUX_IOCTL_DRM_MAX, NULL, linux_gen_dirmap),
 	MAPPED_IOCTL_MAPF(0, 0, NULL)
 };
 
@@ -1162,11 +1161,4 @@ SYSINIT(DRM(register), SI_SUB_KLD, SI_OR
 SYSUNINIT(DRM(unregister), SI_SUB_KLD, SI_ORDER_MIDDLE, 
     mapped_ioctl_unregister_handler, &DRM(ioctl_handler));
 
-static int
-DRM(ioctl_dirmap)(struct file *fp, u_long cmd, u_long ocmd, caddr_t data, struct thread *td)
-{
-	return(linux_ioctl_dirmap(fp, cmd + (ocmd - LINUX_IOCTL_DRM_MIN),
-				  ocmd, data, td));
-}
-
 #endif /* DRM_LINUX */