Merge remote-tracking branch 'sound-asoc/for-next'

[deliverable/linux.git] / drivers / net / ethernet / sfc / farch.c

diff --git a/drivers/net/ethernet/sfc/farch.c b/drivers/net/ethernet/sfc/farch.c
index 4c83739d158f1d36714b40d4eedfbec34c942882..4762ec444cb8ee985cbc09985d07fade1027208b 100644 (file)
--- a/drivers/net/ethernet/sfc/farch.c
+++ b/drivers/net/ethernet/sfc/farch.c
@@ -1477,9 +1477,10 @@ void efx_farch_irq_disable_master(struct efx_nic *efx)
  * Interrupt must already have been enabled, otherwise nasty things
  * may happen.
  */
-void efx_farch_irq_test_generate(struct efx_nic *efx)
+int efx_farch_irq_test_generate(struct efx_nic *efx)
 {
        efx_farch_interrupts(efx, true, true);
+       return 0;
 }
 
 /* Process a fatal interrupt