diff options
author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-06-26 16:33:14 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-06-26 16:33:14 -0400 |
commit | da206c9e68cb93fcab43592d46276c02889c1250 (patch) | |
tree | 21264cc26fa0322d668b398808f10bd93558d25f /drivers/net | |
parent | 916d15445f4ad2a9018e5451760734f36083be77 (diff) | |
parent | 2e2d0dcc1bd7ca7c26ea5e29efb7f34bbd564f1c (diff) |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/bunk/trivial
* git://git.kernel.org/pub/scm/linux/kernel/git/bunk/trivial:
typo fixes
Clean up 'inline is not at beginning' warnings for usb storage
Storage class should be first
i386: Trivial typo fixes
ixj: make ixj_set_tone_off() static
spelling fixes
fix paniced->panicked typos
Spelling fixes for Documentation/atomic_ops.txt
move acknowledgment for Mark Adler to CREDITS
remove the bouncing email address of David Campbell
Diffstat (limited to 'drivers/net')
-rw-r--r-- | drivers/net/3c501.c | 4 | ||||
-rw-r--r-- | drivers/net/irda/irport.c | 2 | ||||
-rw-r--r-- | drivers/net/pcmcia/smc91c92_cs.c | 2 | ||||
-rw-r--r-- | drivers/net/wireless/ipw2100.c | 2 |
4 files changed, 5 insertions, 5 deletions
diff --git a/drivers/net/3c501.c b/drivers/net/3c501.c index bb44509fd404..07136ec423bd 100644 --- a/drivers/net/3c501.c +++ b/drivers/net/3c501.c | |||
@@ -508,11 +508,11 @@ static int el_start_xmit(struct sk_buff *skb, struct net_device *dev) | |||
508 | * speak of. We simply pull the packet out of its PIO buffer (which is slow) | 508 | * speak of. We simply pull the packet out of its PIO buffer (which is slow) |
509 | * and queue it for the kernel. Then we reset the card for the next packet. | 509 | * and queue it for the kernel. Then we reset the card for the next packet. |
510 | * | 510 | * |
511 | * We sometimes get suprise interrupts late both because the SMP IRQ delivery | 511 | * We sometimes get surprise interrupts late both because the SMP IRQ delivery |
512 | * is message passing and because the card sometimes seems to deliver late. I | 512 | * is message passing and because the card sometimes seems to deliver late. I |
513 | * think if it is part way through a receive and the mode is changed it carries | 513 | * think if it is part way through a receive and the mode is changed it carries |
514 | * on receiving and sends us an interrupt. We have to band aid all these cases | 514 | * on receiving and sends us an interrupt. We have to band aid all these cases |
515 | * to get a sensible 150kbytes/second performance. Even then you want a small | 515 | * to get a sensible 150kBytes/second performance. Even then you want a small |
516 | * TCP window. | 516 | * TCP window. |
517 | */ | 517 | */ |
518 | 518 | ||
diff --git a/drivers/net/irda/irport.c b/drivers/net/irda/irport.c index 98fa5319e5cc..44efd49bf4a9 100644 --- a/drivers/net/irda/irport.c +++ b/drivers/net/irda/irport.c | |||
@@ -386,7 +386,7 @@ static int __irport_change_speed(struct irda_task *task) | |||
386 | /* Locking notes : this function may be called from irq context with | 386 | /* Locking notes : this function may be called from irq context with |
387 | * spinlock, via irport_write_wakeup(), or from non-interrupt without | 387 | * spinlock, via irport_write_wakeup(), or from non-interrupt without |
388 | * spinlock (from the task timer). Yuck ! | 388 | * spinlock (from the task timer). Yuck ! |
389 | * This is ugly, and unsafe is the spinlock is not already aquired. | 389 | * This is ugly, and unsafe is the spinlock is not already acquired. |
390 | * This will be fixed when irda-task get rewritten. | 390 | * This will be fixed when irda-task get rewritten. |
391 | * Jean II */ | 391 | * Jean II */ |
392 | if (!spin_is_locked(&self->lock)) { | 392 | if (!spin_is_locked(&self->lock)) { |
diff --git a/drivers/net/pcmcia/smc91c92_cs.c b/drivers/net/pcmcia/smc91c92_cs.c index e74bf5014ef6..a73d54553030 100644 --- a/drivers/net/pcmcia/smc91c92_cs.c +++ b/drivers/net/pcmcia/smc91c92_cs.c | |||
@@ -1883,7 +1883,7 @@ static void smc_reset(struct net_device *dev) | |||
1883 | /* Set the Window 1 control, configuration and station addr registers. | 1883 | /* Set the Window 1 control, configuration and station addr registers. |
1884 | No point in writing the I/O base register ;-> */ | 1884 | No point in writing the I/O base register ;-> */ |
1885 | SMC_SELECT_BANK(1); | 1885 | SMC_SELECT_BANK(1); |
1886 | /* Automatically release succesfully transmitted packets, | 1886 | /* Automatically release successfully transmitted packets, |
1887 | Accept link errors, counter and Tx error interrupts. */ | 1887 | Accept link errors, counter and Tx error interrupts. */ |
1888 | outw(CTL_AUTO_RELEASE | CTL_TE_ENABLE | CTL_CR_ENABLE, | 1888 | outw(CTL_AUTO_RELEASE | CTL_TE_ENABLE | CTL_CR_ENABLE, |
1889 | ioaddr + CONTROL); | 1889 | ioaddr + CONTROL); |
diff --git a/drivers/net/wireless/ipw2100.c b/drivers/net/wireless/ipw2100.c index 72335c8eb97f..94aeb23a7729 100644 --- a/drivers/net/wireless/ipw2100.c +++ b/drivers/net/wireless/ipw2100.c | |||
@@ -1485,7 +1485,7 @@ static int ipw2100_hw_stop_adapter(struct ipw2100_priv *priv) | |||
1485 | * | 1485 | * |
1486 | * Sending the PREPARE_FOR_POWER_DOWN will restrict the | 1486 | * Sending the PREPARE_FOR_POWER_DOWN will restrict the |
1487 | * hardware from going into standby mode and will transition | 1487 | * hardware from going into standby mode and will transition |
1488 | * out of D0-standy if it is already in that state. | 1488 | * out of D0-standby if it is already in that state. |
1489 | * | 1489 | * |
1490 | * STATUS_PREPARE_POWER_DOWN_COMPLETE will be sent by the | 1490 | * STATUS_PREPARE_POWER_DOWN_COMPLETE will be sent by the |
1491 | * driver upon completion. Once received, the driver can | 1491 | * driver upon completion. Once received, the driver can |