32c32
< __FBSDID("$FreeBSD: head/sys/dev/sfxge/common/efx_intr.c 293814 2016-01-13 07:25:51Z arybchik $");
---
> __FBSDID("$FreeBSD: head/sys/dev/sfxge/common/efx_intr.c 299320 2016-05-10 07:01:06Z arybchik $");
38c38
< #if EFSYS_OPT_FALCON || EFSYS_OPT_SIENA
---
> #if EFSYS_OPT_SIENA
88c88
< #endif /* EFSYS_OPT_FALCON || EFSYS_OPT_SIENA */
---
> #endif /* EFSYS_OPT_SIENA */
91,104d90
< #if EFSYS_OPT_FALCON
< static efx_intr_ops_t __efx_intr_falcon_ops = {
< falconsiena_intr_init, /* eio_init */
< falconsiena_intr_enable, /* eio_enable */
< falconsiena_intr_disable, /* eio_disable */
< falconsiena_intr_disable_unlocked, /* eio_disable_unlocked */
< falconsiena_intr_trigger, /* eio_trigger */
< falconsiena_intr_status_line, /* eio_status_line */
< falconsiena_intr_status_message, /* eio_status_message */
< falconsiena_intr_fatal, /* eio_fatal */
< falconsiena_intr_fini, /* eio_fini */
< };
< #endif /* EFSYS_OPT_FALCON */
<
158,163d143
< #if EFSYS_OPT_FALCON
< case EFX_FAMILY_FALCON:
< eiop = (efx_intr_ops_t *)&__efx_intr_falcon_ops;
< break;
< #endif /* EFSYS_OPT_FALCON */
<
323c303
< #if EFSYS_OPT_FALCON || EFSYS_OPT_SIENA
---
> #if EFSYS_OPT_SIENA
610c590
< #endif /* EFSYS_OPT_FALCON || EFSYS_OPT_SIENA */
---
> #endif /* EFSYS_OPT_SIENA */