Date: Thu, 24 Jul 2008 09:57:24 GMT From: Ed Schouten <ed@FreeBSD.org> To: Perforce Change Reviews <perforce@FreeBSD.org> Subject: PERFORCE change 145779 for review Message-ID: <200807240957.m6O9vO7g024219@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=145779 Change 145779 by ed@ed_dull on 2008/07/24 09:56:50 IFC. Affected files ... .. //depot/projects/mpsafetty/secure/lib/libcrypto/opensslconf-mips.h#1 branch .. //depot/projects/mpsafetty/sys/dev/kbd/kbd.c#2 integrate .. //depot/projects/mpsafetty/sys/dev/kbdmux/kbdmux.c#2 integrate .. //depot/projects/mpsafetty/sys/dev/usb/ugen.c#2 integrate .. //depot/projects/mpsafetty/sys/dev/usb/uhid.c#2 integrate Differences ... ==== //depot/projects/mpsafetty/sys/dev/kbd/kbd.c#2 (text+ko) ==== @@ -26,7 +26,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/dev/kbd/kbd.c,v 1.47 2007/12/29 21:55:23 wkoszek Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/kbd/kbd.c,v 1.48 2008/07/24 09:54:10 ed Exp $"); #include "opt_kbd.h" @@ -34,9 +34,9 @@ #include <sys/systm.h> #include <sys/kernel.h> #include <sys/malloc.h> +#include <sys/clist.h> #include <sys/conf.h> #include <sys/fcntl.h> -#include <sys/clist.h> #include <sys/poll.h> #include <sys/priv.h> #include <sys/proc.h> ==== //depot/projects/mpsafetty/sys/dev/kbdmux/kbdmux.c#2 (text+ko) ==== @@ -28,7 +28,7 @@ * SUCH DAMAGE. * * $Id: kbdmux.c,v 1.4 2005/07/14 17:38:35 max Exp $ - * $FreeBSD: src/sys/dev/kbdmux/kbdmux.c,v 1.16 2007/12/29 21:55:23 wkoszek Exp $ + * $FreeBSD: src/sys/dev/kbdmux/kbdmux.c,v 1.17 2008/07/24 09:54:10 ed Exp $ */ #include "opt_compat.h" @@ -36,6 +36,7 @@ #include <sys/param.h> #include <sys/bus.h> +#include <sys/clist.h> #include <sys/conf.h> #include <sys/consio.h> #include <sys/fcntl.h> @@ -52,7 +53,6 @@ #include <sys/selinfo.h> #include <sys/systm.h> #include <sys/taskqueue.h> -#include <sys/clist.h> #include <sys/uio.h> #include <dev/kbd/kbdreg.h> #include <dev/kbd/kbdtables.h> ==== //depot/projects/mpsafetty/sys/dev/usb/ugen.c#2 (text+ko) ==== @@ -8,7 +8,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/dev/usb/ugen.c,v 1.111 2007/06/28 06:22:40 imp Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/usb/ugen.c,v 1.112 2008/07/24 09:54:10 ed Exp $"); /*- * Copyright (c) 1998 The NetBSD Foundation, Inc. @@ -50,6 +50,7 @@ #include <sys/param.h> #include <sys/systm.h> +#include <sys/clist.h> #include <sys/kernel.h> #include <sys/malloc.h> #include <sys/module.h> @@ -58,7 +59,6 @@ #include <sys/conf.h> #include <sys/fcntl.h> #include <sys/filio.h> -#include <sys/clist.h> #include <sys/file.h> #include <sys/selinfo.h> #include <sys/poll.h> ==== //depot/projects/mpsafetty/sys/dev/usb/uhid.c#2 (text+ko) ==== @@ -5,7 +5,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/dev/usb/uhid.c,v 1.96 2007/06/21 14:42:33 imp Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/usb/uhid.c,v 1.97 2008/07/24 09:54:10 ed Exp $"); /*- * Copyright (c) 1998 The NetBSD Foundation, Inc. @@ -55,6 +55,7 @@ #include <sys/param.h> #include <sys/systm.h> +#include <sys/clist.h> #include <sys/kernel.h> #include <sys/lock.h> #include <sys/malloc.h> @@ -67,7 +68,6 @@ #include <sys/bus.h> #include <sys/ioccom.h> #include <sys/conf.h> -#include <sys/clist.h> #include <sys/selinfo.h> #include <sys/proc.h> #include <sys/poll.h>
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200807240957.m6O9vO7g024219>