SVN r355732 breaks DRM

-current now fails to build the DRM drivers :-(

Building
/usr/obj/usr/src/amd64.amd64/sys/TOSHI/modules/usr/local/sys/modules/drm-current-kmod/drm/drm_os_freebsd.o
--- drm_os_freebsd.o ---
/usr/local/sys/modules/drm-current-kmod/drivers/gpu/drm/drm_os_freebsd.c:47:3:
error: implicit declaration of function 'untimeout' is invalid in C99
[-Werror,-Wimplicit-function-declaration]
                untimeout(clear_debug_func, NULL, reset_debug_log_handle);
                ^
/usr/local/sys/modules/drm-current-kmod/drivers/gpu/drm/drm_os_freebsd.c:57:28:
error: implicit declaration of function 'timeout' is invalid in C99
[-Werror,-Wimplicit-function-declaration]
                reset_debug_log_handle = timeout(clear_debug_func, NULL,
                                         ^
/usr/local/sys/modules/drm-current-kmod/drivers/gpu/drm/drm_os_freebsd.c:57:26:
error: assigning to 'struct callout_handle' from incompatible type 'int'
                reset_debug_log_handle = timeout(clear_debug_func, NULL,
                                       ^ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
3 errors generated.

	imb