Date: Fri, 13 May 2016 07:10:07 +0000 (UTC) From: Andrew Rybchenko <arybchik@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r299606 - in head/sys: dev/sfxge/common modules/sfxge Message-ID: <201605130710.u4D7A7Kl037304@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: arybchik Date: Fri May 13 07:10:07 2016 New Revision: 299606 URL: https://svnweb.freebsd.org/changeset/base/299606 Log: sfxge(4): move ef10_vpd_* to ef10_vpd.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_vpd.c - copied, changed from r299592, head/sys/dev/sfxge/common/hunt_vpd.c Deleted: head/sys/dev/sfxge/common/hunt_vpd.c Modified: head/sys/modules/sfxge/Makefile Copied and modified: head/sys/dev/sfxge/common/ef10_vpd.c (from r299592, head/sys/dev/sfxge/common/hunt_vpd.c) ============================================================================== --- head/sys/dev/sfxge/common/hunt_vpd.c Fri May 13 06:26:42 2016 (r299592, copy source) +++ head/sys/dev/sfxge/common/ef10_vpd.c Fri May 13 07:10:07 2016 (r299606) @@ -37,7 +37,7 @@ __FBSDID("$FreeBSD$"); #if EFSYS_OPT_VPD -#if EFSYS_OPT_HUNTINGTON +#if EFSYS_OPT_HUNTINGTON || EFSYS_OPT_MEDFORD #include "ef10_tlv_layout.h" @@ -458,6 +458,6 @@ ef10_vpd_fini( } } -#endif /* EFSYS_OPT_HUNTINGTON */ +#endif /* EFSYS_OPT_HUNTINGTON || EFSYS_OPT_MEDFORD */ #endif /* EFSYS_OPT_VPD */ Modified: head/sys/modules/sfxge/Makefile ============================================================================== --- head/sys/modules/sfxge/Makefile Fri May 13 07:08:33 2016 (r299605) +++ head/sys/modules/sfxge/Makefile Fri May 13 07:10:07 2016 (r299606) @@ -30,11 +30,10 @@ 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 ef10_phy.c ef10_rx.c ef10_tx.c +SRCS+= ef10_nvram.c ef10_phy.c ef10_rx.c ef10_tx.c ef10_vpd.c SRCS+= ef10_impl.h -SRCS+= hunt_nic.c -SRCS+= hunt_phy.c hunt_vpd.c +SRCS+= hunt_nic.c hunt_phy.c SRCS+= hunt_impl.h SRCS+= medford_nic.c
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201605130710.u4D7A7Kl037304>