diff options
| author | David S. Miller <davem@davemloft.net> | 2011-04-11 16:44:25 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-04-11 16:44:25 -0400 |
| commit | 1c01a80cfec6f806246f31ff2680cd3639b30e67 (patch) | |
| tree | 0b554aad2ec1da71ecf6339d4ba51617bfe1dc3c /drivers/net/skfp/smt.c | |
| parent | c44d79950b2daa1025e62eede73e4e4a274d1ef3 (diff) | |
| parent | 4a9f65f6304a00f6473e83b19c1e83caa1e42530 (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
drivers/net/smsc911x.c
Diffstat (limited to 'drivers/net/skfp/smt.c')
| -rw-r--r-- | drivers/net/skfp/smt.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/skfp/smt.c b/drivers/net/skfp/smt.c index 1e1bd0c201c..08d94329c12 100644 --- a/drivers/net/skfp/smt.c +++ b/drivers/net/skfp/smt.c | |||
| @@ -219,7 +219,7 @@ void smt_emulate_token_ct(struct s_smc *smc, int mac_index) | |||
| 219 | 219 | ||
| 220 | /* | 220 | /* |
| 221 | * Only when ring is up we will have a token count. The | 221 | * Only when ring is up we will have a token count. The |
| 222 | * flag is unfortunatly a single instance value. This | 222 | * flag is unfortunately a single instance value. This |
| 223 | * doesn't matter now, because we currently have only | 223 | * doesn't matter now, because we currently have only |
| 224 | * one MAC instance. | 224 | * one MAC instance. |
| 225 | */ | 225 | */ |