Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial

[linux-beck.git] / drivers / net / ethernet / broadcom / bnx2x / bnx2x_main.c

diff --git a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c
index c4daee1b72865180c33c96e906d55f8232f060bf..e81a747ea8ce0ee4461fea92565fa32b15ea6682 100644 (file)
--- a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c
+++ b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c
@@ -8843,7 +8843,7 @@ static void bnx2x_set_234_gates(struct bnx2x *bp, bool close)
                       (!close) ? (val | HC_CONFIG_0_REG_BLOCK_DISABLE_0) :
                       (val & ~(u32)HC_CONFIG_0_REG_BLOCK_DISABLE_0));
        } else {
-               /* Prevent incomming interrupts in IGU */
+               /* Prevent incoming interrupts in IGU */
                val = REG_RD(bp, IGU_REG_BLOCK_CONFIGURATION);
 
                REG_WR(bp, IGU_REG_BLOCK_CONFIGURATION,