Date: Sat, 4 Jun 2016 14:19:01 +0000 (UTC) From: Andrew Rybchenko <arybchik@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org Subject: svn commit: r301318 - stable/10/sys/dev/sfxge/common Message-ID: <201606041419.u54EJ1iE084535@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: arybchik Date: Sat Jun 4 14:19:00 2016 New Revision: 301318 URL: https://svnweb.freebsd.org/changeset/base/301318 Log: MFC r299252 sfxge(4): cleanup: fix obsolete EFSYS_OPT_PHY_BIST option Submitted by: Andy Moreton <amoreton at solarflare.com> Sponsored by: Solarflare Communications, Inc. Modified: stable/10/sys/dev/sfxge/common/efsys.h stable/10/sys/dev/sfxge/common/efx_check.h Directory Properties: stable/10/ (props changed) Modified: stable/10/sys/dev/sfxge/common/efsys.h ============================================================================== --- stable/10/sys/dev/sfxge/common/efsys.h Sat Jun 4 14:16:00 2016 (r301317) +++ stable/10/sys/dev/sfxge/common/efsys.h Sat Jun 4 14:19:00 2016 (r301318) @@ -271,7 +271,6 @@ sfxge_map_mbuf_fast(bus_dma_tag_t tag, b #define EFSYS_OPT_PHY_QT2025C 0 #define EFSYS_OPT_PHY_STATS 1 #define EFSYS_OPT_PHY_PROPS 0 -#define EFSYS_OPT_PHY_BIST 0 #define EFSYS_OPT_BIST 1 #define EFSYS_OPT_PHY_LED_CONTROL 1 #define EFSYS_OPT_PHY_FLAGS 0 Modified: stable/10/sys/dev/sfxge/common/efx_check.h ============================================================================== --- stable/10/sys/dev/sfxge/common/efx_check.h Sat Jun 4 14:16:00 2016 (r301317) +++ stable/10/sys/dev/sfxge/common/efx_check.h Sat Jun 4 14:19:00 2016 (r301318) @@ -260,9 +260,9 @@ #endif /* EFSYS_OPT_PCIE_TUNE */ /* Obsolete option */ -#if EFSYS_OPT_PHY_BIST -# error "PHY_BIST is obsolete (replaced by BIST)." -#endif /* EFSYS_OPT_PHY_BIST */ +#ifdef EFSYS_OPT_PHY_BIST +# error "PHY_BIST is obsolete (replaced by BIST)." +#endif /* Support PHY flags */ #if EFSYS_OPT_PHY_FLAGS
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201606041419.u54EJ1iE084535>