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/amd8111e.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/amd8111e.c')
| -rw-r--r-- | drivers/net/amd8111e.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/amd8111e.c b/drivers/net/amd8111e.c index 2ca880b4c0db..88495c48a81d 100644 --- a/drivers/net/amd8111e.c +++ b/drivers/net/amd8111e.c | |||
| @@ -1398,7 +1398,7 @@ static void amd8111e_set_multicast_list(struct net_device *dev) | |||
| 1398 | mc_filter[1] = mc_filter[0] = 0; | 1398 | mc_filter[1] = mc_filter[0] = 0; |
| 1399 | lp->options &= ~OPTION_MULTICAST_ENABLE; | 1399 | lp->options &= ~OPTION_MULTICAST_ENABLE; |
| 1400 | amd8111e_writeq(*(u64*)mc_filter,lp->mmio + LADRF); | 1400 | amd8111e_writeq(*(u64*)mc_filter,lp->mmio + LADRF); |
| 1401 | /* disable promiscous mode */ | 1401 | /* disable promiscuous mode */ |
| 1402 | writel(PROM, lp->mmio + CMD2); | 1402 | writel(PROM, lp->mmio + CMD2); |
| 1403 | return; | 1403 | return; |
| 1404 | } | 1404 | } |