Merge branches 'x86-fixes-for-linus', 'sched-fixes-for-linus', 'timers-fixes-for...

[pandora-kernel.git] / drivers / net / cris / eth_v10.c

diff --git a/drivers/net/cris/eth_v10.c b/drivers/net/cris/eth_v10.c
index 80c2fee..9d267d3 100644 (file)
--- a/drivers/net/cris/eth_v10.c
+++ b/drivers/net/cris/eth_v10.c
@@ -1383,7 +1383,7 @@ e100_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)
        spin_lock(&np->lock); /* Preempt protection */
        switch (cmd) {
                /* The ioctls below should be considered obsolete but are */
-               /* still present for compatability with old scripts/apps  */
+               /* still present for compatibility with old scripts/apps  */
                case SET_ETH_SPEED_10:                  /* 10 Mbps */
                        e100_set_speed(dev, 10);
                        break;