diff options
| author | arybchik <arybchik@FreeBSD.org> | 2016-12-31 11:30:18 +0000 |
|---|---|---|
| committer | arybchik <arybchik@FreeBSD.org> | 2016-12-31 11:30:18 +0000 |
| commit | f83e24b3d82a425ec8bd4bb259f6c75ce6786280 (patch) | |
| tree | eacf5150ecf1b3afcb8ae18adf30460dc27c5788 /sys/dev/sfxge | |
| parent | 65741d388395f6c62c008a3515f4c812656ac04e (diff) | |
| download | FreeBSD-src-f83e24b3d82a425ec8bd4bb259f6c75ce6786280.zip FreeBSD-src-f83e24b3d82a425ec8bd4bb259f6c75ce6786280.tar.gz | |
MFC r310742
sfxge(4): fix common code for non-Siena builds
Submitted by: Andy Moreton <amoreton at solarflare.com>
Sponsored by: Solarflare Communications, Inc.
Diffstat (limited to 'sys/dev/sfxge')
| -rw-r--r-- | sys/dev/sfxge/common/efx.h | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/sys/dev/sfxge/common/efx.h b/sys/dev/sfxge/common/efx.h index 3d050a3..a3e3269 100644 --- a/sys/dev/sfxge/common/efx.h +++ b/sys/dev/sfxge/common/efx.h @@ -1105,18 +1105,16 @@ typedef struct efx_nic_cfg_s { #if EFSYS_OPT_PHY_STATS uint64_t enc_phy_stat_mask; #endif /* EFSYS_OPT_PHY_STATS */ -#if EFSYS_OPT_SIENA +#if EFSYS_OPT_MCDI uint8_t enc_mcdi_mdio_channel; #if EFSYS_OPT_PHY_STATS uint32_t enc_mcdi_phy_stat_mask; #endif /* EFSYS_OPT_PHY_STATS */ -#endif /* EFSYS_OPT_SIENA */ -#if (EFSYS_OPT_SIENA || EFSYS_OPT_HUNTINGTON || EFSYS_OPT_MEDFORD) #if EFSYS_OPT_MON_STATS uint32_t *enc_mcdi_sensor_maskp; uint32_t enc_mcdi_sensor_mask_size; #endif /* EFSYS_OPT_MON_STATS */ -#endif /* (EFSYS_OPT_SIENA || EFSYS_OPT_HUNTINGTON || EFSYS_OPT_MEDFORD) */ +#endif /* EFSYS_OPT_MCDI */ #if EFSYS_OPT_BIST uint32_t enc_bist_mask; #endif /* EFSYS_OPT_BIST */ |
