diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-02-04 16:58:52 +0100 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-02-04 16:58:52 +0100 |
| commit | f5bb3a5e9dcdb8435471562b6cada89525cf4df1 (patch) | |
| tree | 7b7cf9b90bacd0e2fe07cb3387516e9243f1ab66 /drivers/net/irda/nsc-ircc.h | |
| parent | Merge branch 'locks' of git://linux-nfs.org/~bfields/linux (diff) | |
| parent | Jesper Juhl is the new trivial patches maintainer (diff) | |
| download | linux-f5bb3a5e9dcdb8435471562b6cada89525cf4df1.tar.xz linux-f5bb3a5e9dcdb8435471562b6cada89525cf4df1.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/bunk/trivial
* git://git.kernel.org/pub/scm/linux/kernel/git/bunk/trivial: (79 commits)
Jesper Juhl is the new trivial patches maintainer
Documentation: mention email-clients.txt in SubmittingPatches
fs/binfmt_elf.c: spello fix
do_invalidatepage() comment typo fix
Documentation/filesystems/porting fixes
typo fixes in net/core/net_namespace.c
typo fix in net/rfkill/rfkill.c
typo fixes in net/sctp/sm_statefuns.c
lib/: Spelling fixes
kernel/: Spelling fixes
include/scsi/: Spelling fixes
include/linux/: Spelling fixes
include/asm-m68knommu/: Spelling fixes
include/asm-frv/: Spelling fixes
fs/: Spelling fixes
drivers/watchdog/: Spelling fixes
drivers/video/: Spelling fixes
drivers/ssb/: Spelling fixes
drivers/serial/: Spelling fixes
drivers/scsi/: Spelling fixes
...
Diffstat (limited to 'drivers/net/irda/nsc-ircc.h')
| -rw-r--r-- | drivers/net/irda/nsc-ircc.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/irda/nsc-ircc.h b/drivers/net/irda/nsc-ircc.h index bbdc97ff83ca..29398a4f73fd 100644 --- a/drivers/net/irda/nsc-ircc.h +++ b/drivers/net/irda/nsc-ircc.h @@ -231,13 +231,13 @@ struct st_fifo { struct frame_cb { void *start; /* Start of frame in DMA mem */ - int len; /* Lenght of frame in DMA mem */ + int len; /* Length of frame in DMA mem */ }; struct tx_fifo { struct frame_cb queue[MAX_TX_WINDOW]; /* Info about frames in queue */ int ptr; /* Currently being sent */ - int len; /* Lenght of queue */ + int len; /* Length of queue */ int free; /* Next free slot */ void *tail; /* Next free start in DMA mem */ }; |