git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc
[sfrench/cifs-2.6.git]
/
drivers
/
net
/
typhoon.c
diff --git
a/drivers/net/typhoon.c
b/drivers/net/typhoon.c
index f2dd7763cd0b6661b23dfae1aaa74562f0a29153..f72573594121340f217336024e9a1aff192c30db 100644
(file)
--- a/
drivers/net/typhoon.c
+++ b/
drivers/net/typhoon.c
@@
-639,7
+639,7
@@
typhoon_issue_command(struct typhoon *tp, int num_cmd, struct cmd_desc *cmd,
typhoon_inc_cmd_index(&ring->lastWrite, num_cmd);
- /* "I feel a presence... another warrior is on the
the
mesa."
+ /* "I feel a presence... another warrior is on the mesa."
*/
wmb();
iowrite32(ring->lastWrite, tp->ioaddr + TYPHOON_REG_CMD_READY);