From owner-svn-src-head@FreeBSD.ORG  Thu Jun 26 13:57:45 2014
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 55F5A757;
 Thu, 26 Jun 2014 13:57:45 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 294272B84;
 Thu, 26 Jun 2014 13:57:45 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s5QDvjfZ006316;
 Thu, 26 Jun 2014 13:57:45 GMT (envelope-from pjd@svn.freebsd.org)
Received: (from pjd@localhost)
 by svn.freebsd.org (8.14.8/8.14.8/Submit) id s5QDvi1L006310;
 Thu, 26 Jun 2014 13:57:44 GMT (envelope-from pjd@svn.freebsd.org)
Message-Id: <201406261357.s5QDvi1L006310@svn.freebsd.org>
From: Pawel Jakub Dawidek <pjd@FreeBSD.org>
Date: Thu, 26 Jun 2014 13:57:44 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r267914 - in head: sbin/dhclient sys/kern
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 26 Jun 2014 13:57:45 -0000

Author: pjd
Date: Thu Jun 26 13:57:44 2014
New Revision: 267914
URL: http://svnweb.freebsd.org/changeset/base/267914

Log:
  Remove duplicated includes.
  
  Submitted by:	Mariusz Zaborski <oshogbo@FreeBSD.org>

Modified:
  head/sbin/dhclient/bpf.c
  head/sbin/dhclient/dhclient.c
  head/sys/kern/kern_exec.c
  head/sys/kern/subr_capability.c

Modified: head/sbin/dhclient/bpf.c
==============================================================================
--- head/sbin/dhclient/bpf.c	Thu Jun 26 13:02:21 2014	(r267913)
+++ head/sbin/dhclient/bpf.c	Thu Jun 26 13:57:44 2014	(r267914)
@@ -43,8 +43,6 @@
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");
 
-#include <sys/capsicum.h>
-
 #include "dhcpd.h"
 #include "privsep.h"
 #include <sys/capsicum.h>

Modified: head/sbin/dhclient/dhclient.c
==============================================================================
--- head/sbin/dhclient/dhclient.c	Thu Jun 26 13:02:21 2014	(r267913)
+++ head/sbin/dhclient/dhclient.c	Thu Jun 26 13:57:44 2014	(r267914)
@@ -56,8 +56,6 @@
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");
 
-#include <sys/capsicum.h>
-
 #include "dhcpd.h"
 #include "privsep.h"
 

Modified: head/sys/kern/kern_exec.c
==============================================================================
--- head/sys/kern/kern_exec.c	Thu Jun 26 13:02:21 2014	(r267913)
+++ head/sys/kern/kern_exec.c	Thu Jun 26 13:57:44 2014	(r267914)
@@ -35,7 +35,6 @@ __FBSDID("$FreeBSD$");
 #include <sys/param.h>
 #include <sys/capsicum.h>
 #include <sys/systm.h>
-#include <sys/capsicum.h>
 #include <sys/eventhandler.h>
 #include <sys/lock.h>
 #include <sys/mutex.h>

Modified: head/sys/kern/subr_capability.c
==============================================================================
--- head/sys/kern/subr_capability.c	Thu Jun 26 13:02:21 2014	(r267913)
+++ head/sys/kern/subr_capability.c	Thu Jun 26 13:57:44 2014	(r267914)
@@ -34,16 +34,14 @@ __FBSDID("$FreeBSD$");
  * Note that this file is compiled into the kernel and into libc.
  */
 
-#ifdef _KERNEL
 #include <sys/types.h>
 #include <sys/capsicum.h>
+
+#ifdef _KERNEL
 #include <sys/systm.h>
 
 #include <machine/stdarg.h>
 #else	/* !_KERNEL */
-#include <sys/types.h>
-#include <sys/capsicum.h>
-
 #include <assert.h>
 #include <stdarg.h>
 #include <stdbool.h>