From dcab148366c26d2f06d452315daad55d4d5e8be9 Mon Sep 17 00:00:00 2001 From: Andrew Rybchenko Date: Fri, 13 May 2016 07:04:28 +0000 Subject: [PATCH] sfxge(4): move ef10_nvram_* to ef10_nvram.c Submitted by: Andy Moreton Sponsored by: Solarflare Communications, Inc. MFC after: 1 week --- sys/dev/sfxge/common/{hunt_nvram.c => ef10_nvram.c} | 4 ++-- sys/modules/sfxge/Makefile | 3 ++- 2 files changed, 4 insertions(+), 3 deletions(-) rename sys/dev/sfxge/common/{hunt_nvram.c => ef10_nvram.c} (99%) diff --git a/sys/dev/sfxge/common/hunt_nvram.c b/sys/dev/sfxge/common/ef10_nvram.c similarity index 99% rename from sys/dev/sfxge/common/hunt_nvram.c rename to sys/dev/sfxge/common/ef10_nvram.c index e124c3eb1855..e63ba87ab5a2 100644 --- a/sys/dev/sfxge/common/hunt_nvram.c +++ b/sys/dev/sfxge/common/ef10_nvram.c @@ -34,7 +34,7 @@ __FBSDID("$FreeBSD$"); #include "efx.h" #include "efx_impl.h" -#if EFSYS_OPT_HUNTINGTON +#if EFSYS_OPT_HUNTINGTON || EFSYS_OPT_MEDFORD #if EFSYS_OPT_VPD || EFSYS_OPT_NVRAM @@ -2330,4 +2330,4 @@ ef10_nvram_partn_rw_finish( #endif /* EFSYS_OPT_NVRAM */ -#endif /* EFSYS_OPT_HUNTINGTON */ +#endif /* EFSYS_OPT_HUNTINGTON || EFSYS_OPT_MEDFORD */ diff --git a/sys/modules/sfxge/Makefile b/sys/modules/sfxge/Makefile index f50472977d18..df8e0583d17d 100644 --- a/sys/modules/sfxge/Makefile +++ b/sys/modules/sfxge/Makefile @@ -30,10 +30,11 @@ SRCS+= siena_sram.c siena_vpd.c SRCS+= siena_flash.h siena_impl.h SRCS+= ef10_ev.c ef10_filter.c ef10_intr.c ef10_mac.c ef10_mcdi.c ef10_nic.c +SRCS+= ef10_nvram.c SRCS+= ef10_impl.h SRCS+= hunt_nic.c -SRCS+= hunt_nvram.c hunt_rx.c hunt_phy.c hunt_tx.c hunt_vpd.c +SRCS+= hunt_rx.c hunt_phy.c hunt_tx.c hunt_vpd.c SRCS+= hunt_impl.h SRCS+= medford_nic.c