Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6

[linux.git] / drivers / net / ibmlana.c

diff --git a/drivers/net/ibmlana.c b/drivers/net/ibmlana.c
index f872f966927aecdc5c463b15a3662f932ec2b31f..a7d6cad3295368a85f5720965746930141f51ac6 100644 (file)
--- a/drivers/net/ibmlana.c
+++ b/drivers/net/ibmlana.c
@@ -53,7 +53,7 @@ History:
        still work with 2.0.x....
   Jan 28th, 2000
        in Linux 2.2.13, the version.h file mysteriously didn't get
-       included.  Added a workaround for this.  Futhermore, it now
+       included.  Added a workaround for this.  Furthermore, it now
        not only compiles as a modules ;-)
   Jan 30th, 2000
        newer kernels automatically probe more than one board, so the
@@ -481,7 +481,7 @@ static void InitBoard(struct net_device *dev)
        if ((dev->flags & IFF_ALLMULTI) || netdev_mc_count(dev) > camcnt)
                rcrval |= RCREG_AMC;
 
-       /* promiscous mode ? */
+       /* promiscuous mode ? */
 
        if (dev->flags & IFF_PROMISC)
                rcrval |= RCREG_PRO;