svn commit: r299598 - in head/sys: dev/sfxge/common modules/sfxge

[Andrew Rybchenko]

Author: arybchik
Date: Fri May 13 06:58:20 2016
New Revision: 299598
URL: https://svnweb.freebsd.org/changeset/base/299598

Log:
  sfxge(4): move ef10_intr_* to ef10_intr.c
  
  Submitted by:   Andy Moreton <amoreton at solarflare.com>
  Sponsored by:   Solarflare Communications, Inc.
  MFC after:      1 week

Added:
  head/sys/dev/sfxge/common/ef10_intr.c
     - copied, changed from r299592, head/sys/dev/sfxge/common/hunt_intr.c
Deleted:
  head/sys/dev/sfxge/common/hunt_intr.c
Modified:
  head/sys/modules/sfxge/Makefile

Copied and modified: head/sys/dev/sfxge/common/ef10_intr.c (from r299592, head/sys/dev/sfxge/common/hunt_intr.c)
==============================================================================
--- head/sys/dev/sfxge/common/hunt_intr.c	Fri May 13 06:26:42 2016	(r299592, copy source)
+++ head/sys/dev/sfxge/common/ef10_intr.c	Fri May 13 06:58:20 2016	(r299598)
@@ -35,7 +35,7 @@ __FBSDID("$FreeBSD$");
 #include "efx_impl.h"
 
 
-#if EFSYS_OPT_HUNTINGTON
+#if EFSYS_OPT_HUNTINGTON || EFSYS_OPT_MEDFORD
 
 	__checkReturn	efx_rc_t
 ef10_intr_init(
@@ -197,4 +197,4 @@ ef10_intr_fini(
 	_NOTE(ARGUNUSED(enp))
 }
 
-#endif	/* EFSYS_OPT_HUNTINGTON */
+#endif	/* EFSYS_OPT_HUNTINGTON || EFSYS_OPT_MEDFORD */

Modified: head/sys/modules/sfxge/Makefile
==============================================================================
--- head/sys/modules/sfxge/Makefile	Fri May 13 06:57:08 2016	(r299597)
+++ head/sys/modules/sfxge/Makefile	Fri May 13 06:58:20 2016	(r299598)
@@ -29,10 +29,10 @@ SRCS+=	siena_mac.c siena_mcdi.c siena_ni
 SRCS+=	siena_sram.c siena_vpd.c
 SRCS+=	siena_flash.h siena_impl.h
 
-SRCS+=	ef10_ev.c ef10_filter.c
+SRCS+=	ef10_ev.c ef10_filter.c ef10_intr.c
 SRCS+=	ef10_impl.h
 
-SRCS+=	hunt_intr.c hunt_mac.c hunt_mcdi.c hunt_nic.c
+SRCS+=	hunt_mac.c hunt_mcdi.c hunt_nic.c
 SRCS+=	hunt_nvram.c hunt_rx.c hunt_phy.c hunt_tx.c hunt_vpd.c
 SRCS+=	hunt_impl.h