Merge branch 'fix/asoc' into for-linus

[pandora-kernel.git] / drivers / net / via-velocity.c

diff --git a/drivers/net/via-velocity.c b/drivers/net/via-velocity.c
index cab96ad..09cac70 100644 (file)
--- a/drivers/net/via-velocity.c
+++ b/drivers/net/via-velocity.c
@@ -898,7 +898,7 @@ static int velocity_set_media_mode(struct velocity_info *vptr, u32 mii_status)
        set_mii_flow_control(vptr);
 
        /*
-          Check if new status is consisent with current status
+          Check if new status is consistent with current status
           if (((mii_status & curr_status) & VELOCITY_AUTONEG_ENABLE) ||
               (mii_status==curr_status)) {
           vptr->mii_status=mii_check_media_mode(vptr->mac_regs);