git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'stable/bug-fixes-rc2' of git://git.kernel.org/pub/scm/linux/kernel...
[pandora-kernel.git]
/
drivers
/
net
/
acenic.c
diff --git
a/drivers/net/acenic.c
b/drivers/net/acenic.c
index
41d9911
..
ee648fe
100644
(file)
--- a/
drivers/net/acenic.c
+++ b/
drivers/net/acenic.c
@@
-1584,7
+1584,7
@@
static void ace_watchdog(struct net_device *data)
/*
* We haven't received a stats update event for more than 2.5
* seconds and there is data in the transmit queue, thus we
/*
* We haven't received a stats update event for more than 2.5
* seconds and there is data in the transmit queue, thus we
- * asume the card is stuck.
+ * as
s
ume the card is stuck.
*/
if (*ap->tx_csm != ap->tx_ret_csm) {
printk(KERN_WARNING "%s: Transmitter is stuck, %08x\n",
*/
if (*ap->tx_csm != ap->tx_ret_csm) {
printk(KERN_WARNING "%s: Transmitter is stuck, %08x\n",
@@
-2564,7
+2564,7
@@
restart:
/*
* A TX-descriptor producer (an IRQ) might have gotten
/*
* A TX-descriptor producer (an IRQ) might have gotten
- *
in
between, making the ring free again. Since xmit is
+ * between, making the ring free again. Since xmit is
* serialized, this is the only situation we have to
* re-test.
*/
* serialized, this is the only situation we have to
* re-test.
*/