Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 82777
b: refs/heads/master
c: 8dfba4d
h: refs/heads/master
i:
  82775: ba33490
v: v3
  • Loading branch information
Joe Perches authored and Adrian Bunk committed Feb 3, 2008
1 parent b8591f9 commit 59a7f8d
Show file tree
Hide file tree
Showing 11 changed files with 12 additions and 12 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: b92b1c5725d028ead3946ac8af5a5614155710b3
refs/heads/master: 8dfba4d71b77bca83a6f9943fc8e53439310cffd
2 changes: 1 addition & 1 deletion trunk/drivers/char/drm/r300_reg.h
Original file line number Diff line number Diff line change
Expand Up @@ -584,7 +584,7 @@ USE OR OTHER DEALINGS IN THE SOFTWARE.
#define R300_RE_FOG_START 0x4298

/* Not sure why there are duplicate of factor and constant values.
* My best guess so far is that there are seperate zbiases for test and write.
* My best guess so far is that there are separate zbiases for test and write.
* Ordering might be wrong.
* Some of the tests indicate that fgl has a fallback implementation of zbias
* via pixel shaders.
Expand Down
2 changes: 1 addition & 1 deletion trunk/drivers/char/drm/via_dma.c
Original file line number Diff line number Diff line change
Expand Up @@ -400,7 +400,7 @@ static inline uint32_t *via_align_buffer(drm_via_private_t * dev_priv,
}

/*
* This function is used internally by ring buffer mangement code.
* This function is used internally by ring buffer management code.
*
* Returns virtual pointer to ring buffer.
*/
Expand Down
2 changes: 1 addition & 1 deletion trunk/drivers/char/efirtc.c
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
*
* NOTES:
* - Locking is required for safe execution of EFI calls with regards
* to interrrupts and SMP.
* to interrupts and SMP.
*
* TODO (December 1999):
* - provide the API to set/get the WakeUp Alarm (different from the
Expand Down
4 changes: 2 additions & 2 deletions trunk/drivers/char/epca.c
Original file line number Diff line number Diff line change
Expand Up @@ -1797,7 +1797,7 @@ static unsigned termios2digi_c(struct channel *ch, unsigned cflag)
res |= cflag & ((CBAUD ^ CBAUDEX) | PARODD | PARENB | CSTOPB | CSIZE);
/*
* This gets a little confusing. The Digi cards have their own
* representation of c_cflags controling baud rate. For the most part
* representation of c_cflags controlling baud rate. For the most part
* this is identical to the Linux implementation. However; Digi
* supports one rate (76800) that Linux doesn't. This means that the
* c_cflag entry that would normally mean 76800 for Digi actually means
Expand Down Expand Up @@ -2068,7 +2068,7 @@ static int info_ioctl(struct tty_struct *tty, struct file *file,
{
/*
* This call is made by the apps to complete the
* initilization of the board(s). This routine is
* initialization of the board(s). This routine is
* responsible for setting the card to its initial
* state and setting the drivers control fields to the
* sutianle settings for the card in question.
Expand Down
2 changes: 1 addition & 1 deletion trunk/drivers/char/hangcheck-timer.c
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
* The hangcheck-timer driver uses the TSC to catch delays that
* jiffies does not notice. A timer is set. When the timer fires, it
* checks whether it was delayed and if that delay exceeds a given
* margin of error. The hangcheck_tick module paramter takes the timer
* margin of error. The hangcheck_tick module parameter takes the timer
* duration in seconds. The hangcheck_margin parameter defines the
* margin of error, in seconds. The defaults are 60 seconds for the
* timer and 180 seconds for the margin of error. IOW, a timer is set
Expand Down
2 changes: 1 addition & 1 deletion trunk/drivers/char/hvcs.c
Original file line number Diff line number Diff line change
Expand Up @@ -838,7 +838,7 @@ static int __devexit hvcs_remove(struct vio_dev *dev)
if (!hvcsd)
return -ENODEV;

/* By this time the vty-server won't be getting any more interrups */
/* By this time the vty-server won't be getting any more interrupts */

spin_lock_irqsave(&hvcsd->lock, flags);

Expand Down
2 changes: 1 addition & 1 deletion trunk/drivers/char/ip2/i2lib.c
Original file line number Diff line number Diff line change
Expand Up @@ -661,7 +661,7 @@ i2QueueCommands(int type, i2ChanStrPtr pCh, int timeout, int nCommands,
if (!in_interrupt()) {
schedule_timeout_interruptible(1); // short nap
} else {
// we cannot sched/sleep in interrrupt silly
// we cannot sched/sleep in interrupt silly
return 0;
}
if (signal_pending(current)) {
Expand Down
2 changes: 1 addition & 1 deletion trunk/drivers/char/ip2/ip2main.c
Original file line number Diff line number Diff line change
Expand Up @@ -1251,7 +1251,7 @@ ip2_poll(unsigned long arg)

// Just polled boards, IRQ = 0 will hit all non-interrupt boards.
// It will NOT poll boards handled by hard interrupts.
// The issue of queued BH interrups is handled in ip2_interrupt().
// The issue of queued BH interrupts is handled in ip2_interrupt().
ip2_polled_interrupt();

PollTimer.expires = POLL_TIMEOUT;
Expand Down
2 changes: 1 addition & 1 deletion trunk/drivers/char/synclink.c
Original file line number Diff line number Diff line change
Expand Up @@ -1544,7 +1544,7 @@ static void mgsl_isr_receive_data( struct mgsl_struct *info )

/* mgsl_isr_misc()
*
* Service a miscellaneos interrupt source.
* Service a miscellaneous interrupt source.
*
* Arguments: info pointer to device extension (instance data)
* Return Value: None
Expand Down
2 changes: 1 addition & 1 deletion trunk/drivers/char/toshiba.c
Original file line number Diff line number Diff line change
Expand Up @@ -505,7 +505,7 @@ static int __init toshiba_init(void)
if (tosh_probe())
return -ENODEV;

printk(KERN_INFO "Toshiba System Managment Mode driver v" TOSH_VERSION "\n");
printk(KERN_INFO "Toshiba System Management Mode driver v" TOSH_VERSION "\n");

/* set the port to use for Fn status if not specified as a parameter */
if (tosh_fn==0x00)
Expand Down

0 comments on commit 59a7f8d

Please sign in to comment.