From owner-svn-src-stable-10@freebsd.org  Thu Jan 14 16:27:48 2016
Return-Path: <owner-svn-src-stable-10@freebsd.org>
Delivered-To: svn-src-stable-10@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 75B3CA82B3F;
 Thu, 14 Jan 2016 16:27:48 +0000 (UTC)
 (envelope-from arybchik@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::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 4088A1863;
 Thu, 14 Jan 2016 16:27:48 +0000 (UTC)
 (envelope-from arybchik@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u0EGRlD8063893;
 Thu, 14 Jan 2016 16:27:47 GMT (envelope-from arybchik@FreeBSD.org)
Received: (from arybchik@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id u0EGRhl2063850;
 Thu, 14 Jan 2016 16:27:43 GMT (envelope-from arybchik@FreeBSD.org)
Message-Id: <201601141627.u0EGRhl2063850@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: arybchik set sender to
 arybchik@FreeBSD.org using -f
From: Andrew Rybchenko <arybchik@FreeBSD.org>
Date: Thu, 14 Jan 2016 16:27:43 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org
Subject: svn commit: r294016 - stable/10/sys/dev/sfxge/common
X-SVN-Group: stable-10
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-stable-10@freebsd.org
X-Mailman-Version: 2.1.20
Precedence: list
List-Id: SVN commit messages for only the 10-stable src tree
 <svn-src-stable-10.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-stable-10>, 
 <mailto:svn-src-stable-10-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable-10/>
List-Post: <mailto:svn-src-stable-10@freebsd.org>
List-Help: <mailto:svn-src-stable-10-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-stable-10>, 
 <mailto:svn-src-stable-10-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 14 Jan 2016 16:27:48 -0000

Author: arybchik
Date: Thu Jan 14 16:27:43 2016
New Revision: 294016
URL: https://svnweb.freebsd.org/changeset/base/294016

Log:
  MFC r293814
  
  sfxge: cleanup: simplify EFX header includes
  
  Submitted by:   Andy Moreton <amoreton at solarflare.com>
  Sponsored by:   Solarflare Communications, Inc.

Modified:
  stable/10/sys/dev/sfxge/common/efx_bootcfg.c
  stable/10/sys/dev/sfxge/common/efx_crc32.c
  stable/10/sys/dev/sfxge/common/efx_ev.c
  stable/10/sys/dev/sfxge/common/efx_filter.c
  stable/10/sys/dev/sfxge/common/efx_hash.c
  stable/10/sys/dev/sfxge/common/efx_intr.c
  stable/10/sys/dev/sfxge/common/efx_mac.c
  stable/10/sys/dev/sfxge/common/efx_mcdi.c
  stable/10/sys/dev/sfxge/common/efx_mcdi.h
  stable/10/sys/dev/sfxge/common/efx_mon.c
  stable/10/sys/dev/sfxge/common/efx_nic.c
  stable/10/sys/dev/sfxge/common/efx_nvram.c
  stable/10/sys/dev/sfxge/common/efx_phy.c
  stable/10/sys/dev/sfxge/common/efx_port.c
  stable/10/sys/dev/sfxge/common/efx_rx.c
  stable/10/sys/dev/sfxge/common/efx_sram.c
  stable/10/sys/dev/sfxge/common/efx_tx.c
  stable/10/sys/dev/sfxge/common/efx_vpd.c
  stable/10/sys/dev/sfxge/common/efx_wol.c
  stable/10/sys/dev/sfxge/common/hunt_ev.c
  stable/10/sys/dev/sfxge/common/hunt_filter.c
  stable/10/sys/dev/sfxge/common/hunt_intr.c
  stable/10/sys/dev/sfxge/common/hunt_mac.c
  stable/10/sys/dev/sfxge/common/hunt_mcdi.c
  stable/10/sys/dev/sfxge/common/hunt_nic.c
  stable/10/sys/dev/sfxge/common/hunt_nvram.c
  stable/10/sys/dev/sfxge/common/hunt_phy.c
  stable/10/sys/dev/sfxge/common/hunt_rx.c
  stable/10/sys/dev/sfxge/common/hunt_sram.c
  stable/10/sys/dev/sfxge/common/hunt_tx.c
  stable/10/sys/dev/sfxge/common/hunt_vpd.c
  stable/10/sys/dev/sfxge/common/mcdi_mon.c
  stable/10/sys/dev/sfxge/common/medford_nic.c
  stable/10/sys/dev/sfxge/common/siena_mac.c
  stable/10/sys/dev/sfxge/common/siena_mcdi.c
  stable/10/sys/dev/sfxge/common/siena_nic.c
  stable/10/sys/dev/sfxge/common/siena_nvram.c
  stable/10/sys/dev/sfxge/common/siena_phy.c
  stable/10/sys/dev/sfxge/common/siena_sram.c
  stable/10/sys/dev/sfxge/common/siena_vpd.c
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/sys/dev/sfxge/common/efx_bootcfg.c
==============================================================================
--- stable/10/sys/dev/sfxge/common/efx_bootcfg.c	Thu Jan 14 16:26:42 2016	(r294015)
+++ stable/10/sys/dev/sfxge/common/efx_bootcfg.c	Thu Jan 14 16:27:43 2016	(r294016)
@@ -31,9 +31,7 @@
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");
 
-#include "efsys.h"
 #include "efx.h"
-#include "efx_types.h"
 #include "efx_impl.h"
 
 #if EFSYS_OPT_BOOTCFG

Modified: stable/10/sys/dev/sfxge/common/efx_crc32.c
==============================================================================
--- stable/10/sys/dev/sfxge/common/efx_crc32.c	Thu Jan 14 16:26:42 2016	(r294015)
+++ stable/10/sys/dev/sfxge/common/efx_crc32.c	Thu Jan 14 16:27:43 2016	(r294016)
@@ -31,9 +31,7 @@
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");
 
-#include "efsys.h"
 #include "efx.h"
-#include "efx_types.h"
 #include "efx_impl.h"
 
 /*

Modified: stable/10/sys/dev/sfxge/common/efx_ev.c
==============================================================================
--- stable/10/sys/dev/sfxge/common/efx_ev.c	Thu Jan 14 16:26:42 2016	(r294015)
+++ stable/10/sys/dev/sfxge/common/efx_ev.c	Thu Jan 14 16:27:43 2016	(r294016)
@@ -31,12 +31,11 @@
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");
 
-#include "efsys.h"
 #include "efx.h"
-#include "efx_types.h"
-#include "efx_regs.h"
 #include "efx_impl.h"
+#if EFSYS_OPT_MON_MCDI
 #include "mcdi_mon.h"
+#endif
 
 #if EFSYS_OPT_QSTATS
 #define	EFX_EV_QSTAT_INCR(_eep, _stat)					\

Modified: stable/10/sys/dev/sfxge/common/efx_filter.c
==============================================================================
--- stable/10/sys/dev/sfxge/common/efx_filter.c	Thu Jan 14 16:26:42 2016	(r294015)
+++ stable/10/sys/dev/sfxge/common/efx_filter.c	Thu Jan 14 16:27:43 2016	(r294016)
@@ -31,10 +31,7 @@
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");
 
-#include "efsys.h"
 #include "efx.h"
-#include "efx_types.h"
-#include "efx_regs.h"
 #include "efx_impl.h"
 
 

Modified: stable/10/sys/dev/sfxge/common/efx_hash.c
==============================================================================
--- stable/10/sys/dev/sfxge/common/efx_hash.c	Thu Jan 14 16:26:42 2016	(r294015)
+++ stable/10/sys/dev/sfxge/common/efx_hash.c	Thu Jan 14 16:27:43 2016	(r294016)
@@ -42,9 +42,7 @@
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");
 
-#include "efsys.h"
 #include "efx.h"
-#include "efx_types.h"
 #include "efx_impl.h"
 
 /* Hash initial value */

Modified: stable/10/sys/dev/sfxge/common/efx_intr.c
==============================================================================
--- stable/10/sys/dev/sfxge/common/efx_intr.c	Thu Jan 14 16:26:42 2016	(r294015)
+++ stable/10/sys/dev/sfxge/common/efx_intr.c	Thu Jan 14 16:27:43 2016	(r294016)
@@ -31,10 +31,7 @@
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");
 
-#include "efsys.h"
 #include "efx.h"
-#include "efx_types.h"
-#include "efx_regs.h"
 #include "efx_impl.h"
 
 

Modified: stable/10/sys/dev/sfxge/common/efx_mac.c
==============================================================================
--- stable/10/sys/dev/sfxge/common/efx_mac.c	Thu Jan 14 16:26:42 2016	(r294015)
+++ stable/10/sys/dev/sfxge/common/efx_mac.c	Thu Jan 14 16:27:43 2016	(r294016)
@@ -31,9 +31,7 @@
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");
 
-#include "efsys.h"
 #include "efx.h"
-#include "efx_types.h"
 #include "efx_impl.h"
 
 #if EFSYS_OPT_MAC_FALCON_GMAC

Modified: stable/10/sys/dev/sfxge/common/efx_mcdi.c
==============================================================================
--- stable/10/sys/dev/sfxge/common/efx_mcdi.c	Thu Jan 14 16:26:42 2016	(r294015)
+++ stable/10/sys/dev/sfxge/common/efx_mcdi.c	Thu Jan 14 16:27:43 2016	(r294016)
@@ -31,11 +31,7 @@
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");
 
-#include "efsys.h"
 #include "efx.h"
-#include "efx_types.h"
-#include "efx_regs.h"
-#include "efx_regs_mcdi.h"
 #include "efx_impl.h"
 
 #if EFSYS_OPT_MCDI

Modified: stable/10/sys/dev/sfxge/common/efx_mcdi.h
==============================================================================
--- stable/10/sys/dev/sfxge/common/efx_mcdi.h	Thu Jan 14 16:26:42 2016	(r294015)
+++ stable/10/sys/dev/sfxge/common/efx_mcdi.h	Thu Jan 14 16:27:43 2016	(r294016)
@@ -34,7 +34,6 @@
 #define	_SYS_EFX_MCDI_H
 
 #include "efx.h"
-#include "efx_regs.h"
 #include "efx_regs_mcdi.h"
 
 #ifdef	__cplusplus

Modified: stable/10/sys/dev/sfxge/common/efx_mon.c
==============================================================================
--- stable/10/sys/dev/sfxge/common/efx_mon.c	Thu Jan 14 16:26:42 2016	(r294015)
+++ stable/10/sys/dev/sfxge/common/efx_mon.c	Thu Jan 14 16:27:43 2016	(r294016)
@@ -31,10 +31,7 @@
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");
 
-#include "efsys.h"
 #include "efx.h"
-#include "efx_types.h"
-#include "efx_regs.h"
 #include "efx_impl.h"
 
 #if EFSYS_OPT_MON_NULL

Modified: stable/10/sys/dev/sfxge/common/efx_nic.c
==============================================================================
--- stable/10/sys/dev/sfxge/common/efx_nic.c	Thu Jan 14 16:26:42 2016	(r294015)
+++ stable/10/sys/dev/sfxge/common/efx_nic.c	Thu Jan 14 16:27:43 2016	(r294016)
@@ -31,10 +31,7 @@
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");
 
-#include "efsys.h"
 #include "efx.h"
-#include "efx_types.h"
-#include "efx_regs.h"
 #include "efx_impl.h"
 
 	__checkReturn	efx_rc_t

Modified: stable/10/sys/dev/sfxge/common/efx_nvram.c
==============================================================================
--- stable/10/sys/dev/sfxge/common/efx_nvram.c	Thu Jan 14 16:26:42 2016	(r294015)
+++ stable/10/sys/dev/sfxge/common/efx_nvram.c	Thu Jan 14 16:27:43 2016	(r294016)
@@ -31,10 +31,7 @@
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");
 
-#include "efsys.h"
 #include "efx.h"
-#include "efx_types.h"
-#include "efx_regs.h"
 #include "efx_impl.h"
 
 #if EFSYS_OPT_NVRAM

Modified: stable/10/sys/dev/sfxge/common/efx_phy.c
==============================================================================
--- stable/10/sys/dev/sfxge/common/efx_phy.c	Thu Jan 14 16:26:42 2016	(r294015)
+++ stable/10/sys/dev/sfxge/common/efx_phy.c	Thu Jan 14 16:27:43 2016	(r294016)
@@ -31,10 +31,7 @@
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");
 
-#include "efsys.h"
 #include "efx.h"
-#include "efx_types.h"
-#include "efx_regs.h"
 #include "efx_impl.h"
 #if EFSYS_OPT_FALCON
 #include "falcon_nvram.h"

Modified: stable/10/sys/dev/sfxge/common/efx_port.c
==============================================================================
--- stable/10/sys/dev/sfxge/common/efx_port.c	Thu Jan 14 16:26:42 2016	(r294015)
+++ stable/10/sys/dev/sfxge/common/efx_port.c	Thu Jan 14 16:27:43 2016	(r294016)
@@ -31,9 +31,7 @@
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");
 
-#include "efsys.h"
 #include "efx.h"
-#include "efx_types.h"
 #include "efx_impl.h"
 
 	__checkReturn	efx_rc_t

Modified: stable/10/sys/dev/sfxge/common/efx_rx.c
==============================================================================
--- stable/10/sys/dev/sfxge/common/efx_rx.c	Thu Jan 14 16:26:42 2016	(r294015)
+++ stable/10/sys/dev/sfxge/common/efx_rx.c	Thu Jan 14 16:27:43 2016	(r294016)
@@ -31,10 +31,7 @@
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");
 
-#include "efsys.h"
 #include "efx.h"
-#include "efx_types.h"
-#include "efx_regs.h"
 #include "efx_impl.h"
 
 

Modified: stable/10/sys/dev/sfxge/common/efx_sram.c
==============================================================================
--- stable/10/sys/dev/sfxge/common/efx_sram.c	Thu Jan 14 16:26:42 2016	(r294015)
+++ stable/10/sys/dev/sfxge/common/efx_sram.c	Thu Jan 14 16:27:43 2016	(r294016)
@@ -31,10 +31,7 @@
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");
 
-#include "efsys.h"
 #include "efx.h"
-#include "efx_types.h"
-#include "efx_regs.h"
 #include "efx_impl.h"
 
 	__checkReturn	efx_rc_t

Modified: stable/10/sys/dev/sfxge/common/efx_tx.c
==============================================================================
--- stable/10/sys/dev/sfxge/common/efx_tx.c	Thu Jan 14 16:26:42 2016	(r294015)
+++ stable/10/sys/dev/sfxge/common/efx_tx.c	Thu Jan 14 16:27:43 2016	(r294016)
@@ -31,10 +31,7 @@
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");
 
-#include "efsys.h"
 #include "efx.h"
-#include "efx_types.h"
-#include "efx_regs.h"
 #include "efx_impl.h"
 
 #if EFSYS_OPT_QSTATS

Modified: stable/10/sys/dev/sfxge/common/efx_vpd.c
==============================================================================
--- stable/10/sys/dev/sfxge/common/efx_vpd.c	Thu Jan 14 16:26:42 2016	(r294015)
+++ stable/10/sys/dev/sfxge/common/efx_vpd.c	Thu Jan 14 16:27:43 2016	(r294016)
@@ -31,10 +31,7 @@
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");
 
-#include "efsys.h"
 #include "efx.h"
-#include "efx_types.h"
-#include "efx_regs.h"
 #include "efx_impl.h"
 
 #if EFSYS_OPT_VPD

Modified: stable/10/sys/dev/sfxge/common/efx_wol.c
==============================================================================
--- stable/10/sys/dev/sfxge/common/efx_wol.c	Thu Jan 14 16:26:42 2016	(r294015)
+++ stable/10/sys/dev/sfxge/common/efx_wol.c	Thu Jan 14 16:27:43 2016	(r294016)
@@ -31,9 +31,7 @@
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");
 
-#include "efsys.h"
 #include "efx.h"
-#include "efx_types.h"
 #include "efx_impl.h"
 
 #if EFSYS_OPT_WOL

Modified: stable/10/sys/dev/sfxge/common/hunt_ev.c
==============================================================================
--- stable/10/sys/dev/sfxge/common/hunt_ev.c	Thu Jan 14 16:26:42 2016	(r294015)
+++ stable/10/sys/dev/sfxge/common/hunt_ev.c	Thu Jan 14 16:27:43 2016	(r294016)
@@ -31,10 +31,7 @@
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");
 
-#include "efsys.h"
 #include "efx.h"
-#include "efx_types.h"
-#include "efx_regs.h"
 #include "efx_impl.h"
 #if EFSYS_OPT_MON_STATS
 #include "mcdi_mon.h"

Modified: stable/10/sys/dev/sfxge/common/hunt_filter.c
==============================================================================
--- stable/10/sys/dev/sfxge/common/hunt_filter.c	Thu Jan 14 16:26:42 2016	(r294015)
+++ stable/10/sys/dev/sfxge/common/hunt_filter.c	Thu Jan 14 16:27:43 2016	(r294016)
@@ -31,10 +31,7 @@
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");
 
-#include "efsys.h"
 #include "efx.h"
-#include "efx_types.h"
-#include "efx_regs_mcdi.h"
 #include "efx_impl.h"
 
 #if EFSYS_OPT_HUNTINGTON

Modified: stable/10/sys/dev/sfxge/common/hunt_intr.c
==============================================================================
--- stable/10/sys/dev/sfxge/common/hunt_intr.c	Thu Jan 14 16:26:42 2016	(r294015)
+++ stable/10/sys/dev/sfxge/common/hunt_intr.c	Thu Jan 14 16:27:43 2016	(r294016)
@@ -31,7 +31,6 @@
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");
 
-#include "efsys.h"
 #include "efx.h"
 #include "efx_impl.h"
 

Modified: stable/10/sys/dev/sfxge/common/hunt_mac.c
==============================================================================
--- stable/10/sys/dev/sfxge/common/hunt_mac.c	Thu Jan 14 16:26:42 2016	(r294015)
+++ stable/10/sys/dev/sfxge/common/hunt_mac.c	Thu Jan 14 16:27:43 2016	(r294016)
@@ -31,7 +31,6 @@
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");
 
-#include "efsys.h"
 #include "efx.h"
 #include "efx_impl.h"
 

Modified: stable/10/sys/dev/sfxge/common/hunt_mcdi.c
==============================================================================
--- stable/10/sys/dev/sfxge/common/hunt_mcdi.c	Thu Jan 14 16:26:42 2016	(r294015)
+++ stable/10/sys/dev/sfxge/common/hunt_mcdi.c	Thu Jan 14 16:27:43 2016	(r294016)
@@ -31,7 +31,6 @@
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");
 
-#include "efsys.h"
 #include "efx.h"
 #include "efx_impl.h"
 

Modified: stable/10/sys/dev/sfxge/common/hunt_nic.c
==============================================================================
--- stable/10/sys/dev/sfxge/common/hunt_nic.c	Thu Jan 14 16:26:42 2016	(r294015)
+++ stable/10/sys/dev/sfxge/common/hunt_nic.c	Thu Jan 14 16:27:43 2016	(r294016)
@@ -31,10 +31,11 @@
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");
 
-#include "efsys.h"
 #include "efx.h"
 #include "efx_impl.h"
+#if EFSYS_OPT_MON_MCDI
 #include "mcdi_mon.h"
+#endif
 
 #if EFSYS_OPT_HUNTINGTON
 

Modified: stable/10/sys/dev/sfxge/common/hunt_nvram.c
==============================================================================
--- stable/10/sys/dev/sfxge/common/hunt_nvram.c	Thu Jan 14 16:26:42 2016	(r294015)
+++ stable/10/sys/dev/sfxge/common/hunt_nvram.c	Thu Jan 14 16:27:43 2016	(r294016)
@@ -31,10 +31,7 @@
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");
 
-#include "efsys.h"
 #include "efx.h"
-#include "efx_types.h"
-#include "efx_regs.h"
 #include "efx_impl.h"
 
 #if EFSYS_OPT_HUNTINGTON

Modified: stable/10/sys/dev/sfxge/common/hunt_phy.c
==============================================================================
--- stable/10/sys/dev/sfxge/common/hunt_phy.c	Thu Jan 14 16:26:42 2016	(r294015)
+++ stable/10/sys/dev/sfxge/common/hunt_phy.c	Thu Jan 14 16:27:43 2016	(r294016)
@@ -31,7 +31,6 @@
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");
 
-#include "efsys.h"
 #include "efx.h"
 #include "efx_impl.h"
 

Modified: stable/10/sys/dev/sfxge/common/hunt_rx.c
==============================================================================
--- stable/10/sys/dev/sfxge/common/hunt_rx.c	Thu Jan 14 16:26:42 2016	(r294015)
+++ stable/10/sys/dev/sfxge/common/hunt_rx.c	Thu Jan 14 16:27:43 2016	(r294016)
@@ -31,7 +31,6 @@
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");
 
-#include "efsys.h"
 #include "efx.h"
 #include "efx_impl.h"
 

Modified: stable/10/sys/dev/sfxge/common/hunt_sram.c
==============================================================================
--- stable/10/sys/dev/sfxge/common/hunt_sram.c	Thu Jan 14 16:26:42 2016	(r294015)
+++ stable/10/sys/dev/sfxge/common/hunt_sram.c	Thu Jan 14 16:27:43 2016	(r294016)
@@ -31,7 +31,6 @@
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");
 
-#include "efsys.h"
 #include "efx.h"
 #include "efx_impl.h"
 

Modified: stable/10/sys/dev/sfxge/common/hunt_tx.c
==============================================================================
--- stable/10/sys/dev/sfxge/common/hunt_tx.c	Thu Jan 14 16:26:42 2016	(r294015)
+++ stable/10/sys/dev/sfxge/common/hunt_tx.c	Thu Jan 14 16:27:43 2016	(r294016)
@@ -31,7 +31,6 @@
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");
 
-#include "efsys.h"
 #include "efx.h"
 #include "efx_impl.h"
 

Modified: stable/10/sys/dev/sfxge/common/hunt_vpd.c
==============================================================================
--- stable/10/sys/dev/sfxge/common/hunt_vpd.c	Thu Jan 14 16:26:42 2016	(r294015)
+++ stable/10/sys/dev/sfxge/common/hunt_vpd.c	Thu Jan 14 16:27:43 2016	(r294016)
@@ -31,10 +31,7 @@
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");
 
-#include "efsys.h"
 #include "efx.h"
-#include "efx_types.h"
-#include "efx_regs.h"
 #include "efx_impl.h"
 
 

Modified: stable/10/sys/dev/sfxge/common/mcdi_mon.c
==============================================================================
--- stable/10/sys/dev/sfxge/common/mcdi_mon.c	Thu Jan 14 16:26:42 2016	(r294015)
+++ stable/10/sys/dev/sfxge/common/mcdi_mon.c	Thu Jan 14 16:27:43 2016	(r294016)
@@ -31,7 +31,6 @@
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");
 
-#include "efsys.h"
 #include "efx.h"
 #include "efx_impl.h"
 

Modified: stable/10/sys/dev/sfxge/common/medford_nic.c
==============================================================================
--- stable/10/sys/dev/sfxge/common/medford_nic.c	Thu Jan 14 16:26:42 2016	(r294015)
+++ stable/10/sys/dev/sfxge/common/medford_nic.c	Thu Jan 14 16:27:43 2016	(r294016)
@@ -31,7 +31,6 @@
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");
 
-#include "efsys.h"
 #include "efx.h"
 #include "efx_impl.h"
 #include "mcdi_mon.h"

Modified: stable/10/sys/dev/sfxge/common/siena_mac.c
==============================================================================
--- stable/10/sys/dev/sfxge/common/siena_mac.c	Thu Jan 14 16:26:42 2016	(r294015)
+++ stable/10/sys/dev/sfxge/common/siena_mac.c	Thu Jan 14 16:27:43 2016	(r294016)
@@ -31,7 +31,6 @@
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");
 
-#include "efsys.h"
 #include "efx.h"
 #include "efx_impl.h"
 

Modified: stable/10/sys/dev/sfxge/common/siena_mcdi.c
==============================================================================
--- stable/10/sys/dev/sfxge/common/siena_mcdi.c	Thu Jan 14 16:26:42 2016	(r294015)
+++ stable/10/sys/dev/sfxge/common/siena_mcdi.c	Thu Jan 14 16:27:43 2016	(r294016)
@@ -31,7 +31,6 @@
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");
 
-#include "efsys.h"
 #include "efx.h"
 #include "efx_impl.h"
 

Modified: stable/10/sys/dev/sfxge/common/siena_nic.c
==============================================================================
--- stable/10/sys/dev/sfxge/common/siena_nic.c	Thu Jan 14 16:26:42 2016	(r294015)
+++ stable/10/sys/dev/sfxge/common/siena_nic.c	Thu Jan 14 16:27:43 2016	(r294016)
@@ -31,7 +31,6 @@
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");
 
-#include "efsys.h"
 #include "efx.h"
 #include "efx_impl.h"
 #include "mcdi_mon.h"

Modified: stable/10/sys/dev/sfxge/common/siena_nvram.c
==============================================================================
--- stable/10/sys/dev/sfxge/common/siena_nvram.c	Thu Jan 14 16:26:42 2016	(r294015)
+++ stable/10/sys/dev/sfxge/common/siena_nvram.c	Thu Jan 14 16:27:43 2016	(r294016)
@@ -31,10 +31,7 @@
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");
 
-#include "efsys.h"
 #include "efx.h"
-#include "efx_types.h"
-#include "efx_regs.h"
 #include "efx_impl.h"
 
 #if EFSYS_OPT_SIENA

Modified: stable/10/sys/dev/sfxge/common/siena_phy.c
==============================================================================
--- stable/10/sys/dev/sfxge/common/siena_phy.c	Thu Jan 14 16:26:42 2016	(r294015)
+++ stable/10/sys/dev/sfxge/common/siena_phy.c	Thu Jan 14 16:27:43 2016	(r294016)
@@ -31,7 +31,6 @@
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");
 
-#include "efsys.h"
 #include "efx.h"
 #include "efx_impl.h"
 

Modified: stable/10/sys/dev/sfxge/common/siena_sram.c
==============================================================================
--- stable/10/sys/dev/sfxge/common/siena_sram.c	Thu Jan 14 16:26:42 2016	(r294015)
+++ stable/10/sys/dev/sfxge/common/siena_sram.c	Thu Jan 14 16:27:43 2016	(r294016)
@@ -31,7 +31,6 @@
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");
 
-#include "efsys.h"
 #include "efx.h"
 #include "efx_impl.h"
 

Modified: stable/10/sys/dev/sfxge/common/siena_vpd.c
==============================================================================
--- stable/10/sys/dev/sfxge/common/siena_vpd.c	Thu Jan 14 16:26:42 2016	(r294015)
+++ stable/10/sys/dev/sfxge/common/siena_vpd.c	Thu Jan 14 16:27:43 2016	(r294016)
@@ -31,10 +31,7 @@
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");
 
-#include "efsys.h"
 #include "efx.h"
-#include "efx_types.h"
-#include "efx_regs.h"
 #include "efx_impl.h"
 
 #if EFSYS_OPT_VPD