diff options
Diffstat (limited to 'drivers/char')
-rw-r--r-- | drivers/char/drm/r300_reg.h | 2 | ||||
-rw-r--r-- | drivers/char/drm/via_dma.c | 2 | ||||
-rw-r--r-- | drivers/char/efirtc.c | 2 | ||||
-rw-r--r-- | drivers/char/epca.c | 4 | ||||
-rw-r--r-- | drivers/char/hangcheck-timer.c | 2 | ||||
-rw-r--r-- | drivers/char/hvcs.c | 2 | ||||
-rw-r--r-- | drivers/char/ip2/i2lib.c | 2 | ||||
-rw-r--r-- | drivers/char/ip2/ip2main.c | 2 | ||||
-rw-r--r-- | drivers/char/synclink.c | 2 | ||||
-rw-r--r-- | drivers/char/toshiba.c | 2 |
10 files changed, 11 insertions, 11 deletions
diff --git a/drivers/char/drm/r300_reg.h b/drivers/char/drm/r300_reg.h index 3ae57ecc7afd..fa194a46c1e4 100644 --- a/drivers/char/drm/r300_reg.h +++ b/drivers/char/drm/r300_reg.h | |||
@@ -584,7 +584,7 @@ USE OR OTHER DEALINGS IN THE SOFTWARE. | |||
584 | #define R300_RE_FOG_START 0x4298 | 584 | #define R300_RE_FOG_START 0x4298 |
585 | 585 | ||
586 | /* Not sure why there are duplicate of factor and constant values. | 586 | /* Not sure why there are duplicate of factor and constant values. |
587 | * My best guess so far is that there are seperate zbiases for test and write. | 587 | * My best guess so far is that there are separate zbiases for test and write. |
588 | * Ordering might be wrong. | 588 | * Ordering might be wrong. |
589 | * Some of the tests indicate that fgl has a fallback implementation of zbias | 589 | * Some of the tests indicate that fgl has a fallback implementation of zbias |
590 | * via pixel shaders. | 590 | * via pixel shaders. |
diff --git a/drivers/char/drm/via_dma.c b/drivers/char/drm/via_dma.c index 75d6b748c2c0..7009dbddac43 100644 --- a/drivers/char/drm/via_dma.c +++ b/drivers/char/drm/via_dma.c | |||
@@ -400,7 +400,7 @@ static inline uint32_t *via_align_buffer(drm_via_private_t * dev_priv, | |||
400 | } | 400 | } |
401 | 401 | ||
402 | /* | 402 | /* |
403 | * This function is used internally by ring buffer mangement code. | 403 | * This function is used internally by ring buffer management code. |
404 | * | 404 | * |
405 | * Returns virtual pointer to ring buffer. | 405 | * Returns virtual pointer to ring buffer. |
406 | */ | 406 | */ |
diff --git a/drivers/char/efirtc.c b/drivers/char/efirtc.c index 004141d535a2..49233f589874 100644 --- a/drivers/char/efirtc.c +++ b/drivers/char/efirtc.c | |||
@@ -18,7 +18,7 @@ | |||
18 | * | 18 | * |
19 | * NOTES: | 19 | * NOTES: |
20 | * - Locking is required for safe execution of EFI calls with regards | 20 | * - Locking is required for safe execution of EFI calls with regards |
21 | * to interrrupts and SMP. | 21 | * to interrupts and SMP. |
22 | * | 22 | * |
23 | * TODO (December 1999): | 23 | * TODO (December 1999): |
24 | * - provide the API to set/get the WakeUp Alarm (different from the | 24 | * - provide the API to set/get the WakeUp Alarm (different from the |
diff --git a/drivers/char/epca.c b/drivers/char/epca.c index ffcecde9e2a5..ffd747c5dff0 100644 --- a/drivers/char/epca.c +++ b/drivers/char/epca.c | |||
@@ -1797,7 +1797,7 @@ static unsigned termios2digi_c(struct channel *ch, unsigned cflag) | |||
1797 | res |= cflag & ((CBAUD ^ CBAUDEX) | PARODD | PARENB | CSTOPB | CSIZE); | 1797 | res |= cflag & ((CBAUD ^ CBAUDEX) | PARODD | PARENB | CSTOPB | CSIZE); |
1798 | /* | 1798 | /* |
1799 | * This gets a little confusing. The Digi cards have their own | 1799 | * This gets a little confusing. The Digi cards have their own |
1800 | * representation of c_cflags controling baud rate. For the most part | 1800 | * representation of c_cflags controlling baud rate. For the most part |
1801 | * this is identical to the Linux implementation. However; Digi | 1801 | * this is identical to the Linux implementation. However; Digi |
1802 | * supports one rate (76800) that Linux doesn't. This means that the | 1802 | * supports one rate (76800) that Linux doesn't. This means that the |
1803 | * c_cflag entry that would normally mean 76800 for Digi actually means | 1803 | * c_cflag entry that would normally mean 76800 for Digi actually means |
@@ -2068,7 +2068,7 @@ static int info_ioctl(struct tty_struct *tty, struct file *file, | |||
2068 | { | 2068 | { |
2069 | /* | 2069 | /* |
2070 | * This call is made by the apps to complete the | 2070 | * This call is made by the apps to complete the |
2071 | * initilization of the board(s). This routine is | 2071 | * initialization of the board(s). This routine is |
2072 | * responsible for setting the card to its initial | 2072 | * responsible for setting the card to its initial |
2073 | * state and setting the drivers control fields to the | 2073 | * state and setting the drivers control fields to the |
2074 | * sutianle settings for the card in question. | 2074 | * sutianle settings for the card in question. |
diff --git a/drivers/char/hangcheck-timer.c b/drivers/char/hangcheck-timer.c index 0e8ceea5ea78..712d9f271aa6 100644 --- a/drivers/char/hangcheck-timer.c +++ b/drivers/char/hangcheck-timer.c | |||
@@ -26,7 +26,7 @@ | |||
26 | * The hangcheck-timer driver uses the TSC to catch delays that | 26 | * The hangcheck-timer driver uses the TSC to catch delays that |
27 | * jiffies does not notice. A timer is set. When the timer fires, it | 27 | * jiffies does not notice. A timer is set. When the timer fires, it |
28 | * checks whether it was delayed and if that delay exceeds a given | 28 | * checks whether it was delayed and if that delay exceeds a given |
29 | * margin of error. The hangcheck_tick module paramter takes the timer | 29 | * margin of error. The hangcheck_tick module parameter takes the timer |
30 | * duration in seconds. The hangcheck_margin parameter defines the | 30 | * duration in seconds. The hangcheck_margin parameter defines the |
31 | * margin of error, in seconds. The defaults are 60 seconds for the | 31 | * margin of error, in seconds. The defaults are 60 seconds for the |
32 | * timer and 180 seconds for the margin of error. IOW, a timer is set | 32 | * timer and 180 seconds for the margin of error. IOW, a timer is set |
diff --git a/drivers/char/hvcs.c b/drivers/char/hvcs.c index fd7559084b82..3402def22007 100644 --- a/drivers/char/hvcs.c +++ b/drivers/char/hvcs.c | |||
@@ -838,7 +838,7 @@ static int __devexit hvcs_remove(struct vio_dev *dev) | |||
838 | if (!hvcsd) | 838 | if (!hvcsd) |
839 | return -ENODEV; | 839 | return -ENODEV; |
840 | 840 | ||
841 | /* By this time the vty-server won't be getting any more interrups */ | 841 | /* By this time the vty-server won't be getting any more interrupts */ |
842 | 842 | ||
843 | spin_lock_irqsave(&hvcsd->lock, flags); | 843 | spin_lock_irqsave(&hvcsd->lock, flags); |
844 | 844 | ||
diff --git a/drivers/char/ip2/i2lib.c b/drivers/char/ip2/i2lib.c index e46120d05b68..d6567b32fb5c 100644 --- a/drivers/char/ip2/i2lib.c +++ b/drivers/char/ip2/i2lib.c | |||
@@ -661,7 +661,7 @@ i2QueueCommands(int type, i2ChanStrPtr pCh, int timeout, int nCommands, | |||
661 | if (!in_interrupt()) { | 661 | if (!in_interrupt()) { |
662 | schedule_timeout_interruptible(1); // short nap | 662 | schedule_timeout_interruptible(1); // short nap |
663 | } else { | 663 | } else { |
664 | // we cannot sched/sleep in interrrupt silly | 664 | // we cannot sched/sleep in interrupt silly |
665 | return 0; | 665 | return 0; |
666 | } | 666 | } |
667 | if (signal_pending(current)) { | 667 | if (signal_pending(current)) { |
diff --git a/drivers/char/ip2/ip2main.c b/drivers/char/ip2/ip2main.c index e04e66cf2c68..0f49ccf02a7f 100644 --- a/drivers/char/ip2/ip2main.c +++ b/drivers/char/ip2/ip2main.c | |||
@@ -1251,7 +1251,7 @@ ip2_poll(unsigned long arg) | |||
1251 | 1251 | ||
1252 | // Just polled boards, IRQ = 0 will hit all non-interrupt boards. | 1252 | // Just polled boards, IRQ = 0 will hit all non-interrupt boards. |
1253 | // It will NOT poll boards handled by hard interrupts. | 1253 | // It will NOT poll boards handled by hard interrupts. |
1254 | // The issue of queued BH interrups is handled in ip2_interrupt(). | 1254 | // The issue of queued BH interrupts is handled in ip2_interrupt(). |
1255 | ip2_polled_interrupt(); | 1255 | ip2_polled_interrupt(); |
1256 | 1256 | ||
1257 | PollTimer.expires = POLL_TIMEOUT; | 1257 | PollTimer.expires = POLL_TIMEOUT; |
diff --git a/drivers/char/synclink.c b/drivers/char/synclink.c index 905d1f51a7bf..d010ed95ed3b 100644 --- a/drivers/char/synclink.c +++ b/drivers/char/synclink.c | |||
@@ -1544,7 +1544,7 @@ static void mgsl_isr_receive_data( struct mgsl_struct *info ) | |||
1544 | 1544 | ||
1545 | /* mgsl_isr_misc() | 1545 | /* mgsl_isr_misc() |
1546 | * | 1546 | * |
1547 | * Service a miscellaneos interrupt source. | 1547 | * Service a miscellaneous interrupt source. |
1548 | * | 1548 | * |
1549 | * Arguments: info pointer to device extension (instance data) | 1549 | * Arguments: info pointer to device extension (instance data) |
1550 | * Return Value: None | 1550 | * Return Value: None |
diff --git a/drivers/char/toshiba.c b/drivers/char/toshiba.c index 5422f999636f..ce5ebe3b168f 100644 --- a/drivers/char/toshiba.c +++ b/drivers/char/toshiba.c | |||
@@ -505,7 +505,7 @@ static int __init toshiba_init(void) | |||
505 | if (tosh_probe()) | 505 | if (tosh_probe()) |
506 | return -ENODEV; | 506 | return -ENODEV; |
507 | 507 | ||
508 | printk(KERN_INFO "Toshiba System Managment Mode driver v" TOSH_VERSION "\n"); | 508 | printk(KERN_INFO "Toshiba System Management Mode driver v" TOSH_VERSION "\n"); |
509 | 509 | ||
510 | /* set the port to use for Fn status if not specified as a parameter */ | 510 | /* set the port to use for Fn status if not specified as a parameter */ |
511 | if (tosh_fn==0x00) | 511 | if (tosh_fn==0x00) |