projects
/
linux-2.6-block.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
[linux-2.6-block.git]
/
drivers
/
net
/
tg3.c
diff --git
a/drivers/net/tg3.c
b/drivers/net/tg3.c
index 1205c2a22657cc22dba58547b29abb5df25cd0be..437683aab32c8dab18a91fe92b5ae0741bfed03a 100644
(file)
--- a/
drivers/net/tg3.c
+++ b/
drivers/net/tg3.c
@@
-11225,7
+11225,7
@@
static int __devinit tg3_phy_probe(struct tg3 *tp)
return tg3_phy_init(tp);
/* Reading the PHY ID register can conflict with ASF
- * fir
wm
are access to the PHY hardware.
+ * fir
mw
are access to the PHY hardware.
*/
err = 0;
if ((tp->tg3_flags & TG3_FLAG_ENABLE_ASF) ||