Merge tag 'v2.6.38' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

[mv-sheeva.git] / drivers / net / via-velocity.c

diff --git a/drivers/net/via-velocity.c b/drivers/net/via-velocity.c
index cab96ad49e601488100d744ecacc6a76539f9b34..09cac704fdd74879ed75bf7af5b82ba7d45551dc 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);