Merge branch 'master' into for-next

[pandora-kernel.git] / drivers / net / atlx / atl1.c

diff --git a/drivers/net/atlx/atl1.c b/drivers/net/atlx/atl1.c
index 97e6954..9f3e530 100644 (file)
--- a/drivers/net/atlx/atl1.c
+++ b/drivers/net/atlx/atl1.c
@@ -858,7 +858,7 @@ static s32 atl1_init_hw(struct atl1_hw *hw)
        atl1_init_flash_opcode(hw);
 
        if (!hw->phy_configured) {
-               /* enable GPHY LinkChange Interrrupt */
+               /* enable GPHY LinkChange Interrupt */
                ret_val = atl1_write_phy_reg(hw, 18, 0xC00);
                if (ret_val)
                        return ret_val;