Merge branch 'master' of github.com:davem330/net

[pandora-kernel.git] / drivers / net / ethernet / sfc / siena.c

diff --git a/drivers/net/sfc/siena.c b/drivers/net/ethernet/sfc/siena.c
similarity index 99%
rename from drivers/net/sfc/siena.c
rename to drivers/net/ethernet/sfc/siena.c
index 2c3bd93..cc2549c 100644 (file)
--- a/drivers/net/sfc/siena.c
+++ b/drivers/net/ethernet/sfc/siena.c
@@ -36,6 +36,8 @@ static void siena_push_irq_moderation(struct efx_channel *channel)
 {
        efx_dword_t timer_cmd;
 
+       BUILD_BUG_ON(EFX_IRQ_MOD_MAX > (1 << FRF_CZ_TC_TIMER_VAL_WIDTH));
+
        if (channel->irq_moderation)
                EFX_POPULATE_DWORD_2(timer_cmd,
                                     FRF_CZ_TC_TIMER_MODE,