diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-04-07 14:14:49 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-04-07 14:14:49 -0400 |
commit | 42933bac11e811f02200c944d8562a15f8ec4ff0 (patch) | |
tree | fcdd9afe56eb0e746565ddd1f92f22d36678b843 /drivers/net/ibmlana.c | |
parent | 2b9accbee563f535046ff2cd382d0acaa92e130c (diff) | |
parent | 25985edcedea6396277003854657b5f3cb31a628 (diff) |
Merge branch 'for-linus2' of git://git.profusion.mobi/users/lucas/linux-2.6
* 'for-linus2' of git://git.profusion.mobi/users/lucas/linux-2.6:
Fix common misspellings
Diffstat (limited to 'drivers/net/ibmlana.c')
-rw-r--r-- | drivers/net/ibmlana.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/ibmlana.c b/drivers/net/ibmlana.c index 94d9969ec0bb..8ff68ae6b520 100644 --- a/drivers/net/ibmlana.c +++ b/drivers/net/ibmlana.c | |||
@@ -53,7 +53,7 @@ History: | |||
53 | still work with 2.0.x.... | 53 | still work with 2.0.x.... |
54 | Jan 28th, 2000 | 54 | Jan 28th, 2000 |
55 | in Linux 2.2.13, the version.h file mysteriously didn't get | 55 | in Linux 2.2.13, the version.h file mysteriously didn't get |
56 | included. Added a workaround for this. Futhermore, it now | 56 | included. Added a workaround for this. Furthermore, it now |
57 | not only compiles as a modules ;-) | 57 | not only compiles as a modules ;-) |
58 | Jan 30th, 2000 | 58 | Jan 30th, 2000 |
59 | newer kernels automatically probe more than one board, so the | 59 | newer kernels automatically probe more than one board, so the |
@@ -481,7 +481,7 @@ static void InitBoard(struct net_device *dev) | |||
481 | if ((dev->flags & IFF_ALLMULTI) || netdev_mc_count(dev) > camcnt) | 481 | if ((dev->flags & IFF_ALLMULTI) || netdev_mc_count(dev) > camcnt) |
482 | rcrval |= RCREG_AMC; | 482 | rcrval |= RCREG_AMC; |
483 | 483 | ||
484 | /* promiscous mode ? */ | 484 | /* promiscuous mode ? */ |
485 | 485 | ||
486 | if (dev->flags & IFF_PROMISC) | 486 | if (dev->flags & IFF_PROMISC) |
487 | rcrval |= RCREG_PRO; | 487 | rcrval |= RCREG_PRO; |