Skip site navigation (1)Skip section navigation (2)
Date:      Tue, 21 Mar 2006 20:49:41 GMT
From:      Todd Miller <millert@FreeBSD.org>
To:        Perforce Change Reviews <perforce@freebsd.org>
Subject:   PERFORCE change 93741 for review
Message-ID:  <200603212049.k2LKnfGL086051@repoman.freebsd.org>

next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=93741

Change 93741 by millert@millert_p3 on 2006/03/21 20:48:41

	Fix mis-merge

Affected files ...

.. //depot/projects/trustedbsd/sebsd/sys/kern/kern_descrip.c#23 edit

Differences ...

==== //depot/projects/trustedbsd/sebsd/sys/kern/kern_descrip.c#23 (text+ko) ====

@@ -39,6 +39,7 @@
 
 #include "opt_compat.h"
 #include "opt_ddb.h"
+#include "opt_mac.h"
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -52,6 +53,7 @@
 #include <sys/kernel.h>
 #include <sys/limits.h>
 #include <sys/lock.h>
+#include <sys/mac.h>
 #include <sys/malloc.h>
 #include <sys/mount.h>
 #include <sys/mqueue.h>



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200603212049.k2LKnfGL086051>