import 15.2.0 Octopus source

[ceph.git] / ceph / src / spdk / dpdk / drivers / net / sfc / base / efx_vpd.c

diff --git a/ceph/src/spdk/dpdk/drivers/net/sfc/base/efx_vpd.c b/ceph/src/spdk/dpdk/drivers/net/sfc/base/efx_vpd.c
index 6d783d742bbf58ecd6890ed867be22210a7ae1f4..82675217772c34c20b6c2467aa59607e9cfa8aec 100644 (file)
--- a/ceph/src/spdk/dpdk/drivers/net/sfc/base/efx_vpd.c
+++ b/ceph/src/spdk/dpdk/drivers/net/sfc/base/efx_vpd.c
@@ -44,7 +44,7 @@ static const efx_vpd_ops_t    __efx_vpd_siena_ops = {
 
 #endif /* EFSYS_OPT_SIENA */
 
-#if EFSYS_OPT_HUNTINGTON || EFSYS_OPT_MEDFORD || EFSYS_OPT_MEDFORD2
+#if EFX_OPTS_EF10()
 
 static const efx_vpd_ops_t     __efx_vpd_ef10_ops = {
        ef10_vpd_init,          /* evpdo_init */
@@ -59,7 +59,7 @@ static const efx_vpd_ops_t    __efx_vpd_ef10_ops = {
        ef10_vpd_fini,          /* evpdo_fini */
 };
 
-#endif /* EFSYS_OPT_HUNTINGTON || EFSYS_OPT_MEDFORD || EFSYS_OPT_MEDFORD2 */
+#endif /* EFX_OPTS_EF10() */
 
        __checkReturn           efx_rc_t
 efx_vpd_init(