Merge remote branch 'kumar/merge' into merge

[pandora-kernel.git] / drivers / net / tulip / dmfe.c

diff --git a/drivers/net/tulip/dmfe.c b/drivers/net/tulip/dmfe.c
index 7064e03..fb07f48 100644 (file)
--- a/drivers/net/tulip/dmfe.c
+++ b/drivers/net/tulip/dmfe.c
@@ -1224,7 +1224,7 @@ static void dmfe_timer(unsigned long data)
 
 
        /* If chip reports that link is failed it could be because external
-               PHY link status pin is not conected correctly to chip
+               PHY link status pin is not connected correctly to chip
                To be sure ask PHY too.
        */