diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-03-18 13:37:40 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-03-18 13:37:40 -0400 |
| commit | e16b396ce314b2bcdfe6c173fe075bf8e3432368 (patch) | |
| tree | 640f0f56f2ea676647af4eb42d32fa56be2ee549 /drivers/atm | |
| parent | 7fd23a24717a327a66f3c32d11a20a2f169c824f (diff) | |
| parent | e6e8dd5055a974935af1398c8648d4a9359b0ecb (diff) | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial: (47 commits)
doc: CONFIG_UNEVICTABLE_LRU doesn't exist anymore
Update cpuset info & webiste for cgroups
dcdbas: force SMI to happen when expected
arch/arm/Kconfig: remove one to many l's in the word.
asm-generic/user.h: Fix spelling in comment
drm: fix printk typo 'sracth'
Remove one to many n's in a word
Documentation/filesystems/romfs.txt: fixing link to genromfs
drivers:scsi Change printk typo initate -> initiate
serial, pch uart: Remove duplicate inclusion of linux/pci.h header
fs/eventpoll.c: fix spelling
mm: Fix out-of-date comments which refers non-existent functions
drm: Fix printk typo 'failled'
coh901318.c: Change initate to initiate.
mbox-db5500.c Change initate to initiate.
edac: correct i82975x error-info reported
edac: correct i82975x mci initialisation
edac: correct commented info
fs: update comments to point correct document
target: remove duplicate include of target/target_core_device.h from drivers/target/target_core_hba.c
...
Trivial conflict in fs/eventpoll.c (spelling vs addition)
Diffstat (limited to 'drivers/atm')
| -rw-r--r-- | drivers/atm/firestream.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/atm/firestream.c b/drivers/atm/firestream.c index 7d912baf01d4..049650d42c88 100644 --- a/drivers/atm/firestream.c +++ b/drivers/atm/firestream.c | |||
| @@ -1031,7 +1031,7 @@ static int fs_open(struct atm_vcc *atm_vcc) | |||
| 1031 | /* We now use the "submit_command" function to submit commands to | 1031 | /* We now use the "submit_command" function to submit commands to |
| 1032 | the firestream. There is a define up near the definition of | 1032 | the firestream. There is a define up near the definition of |
| 1033 | that routine that switches this routine between immediate write | 1033 | that routine that switches this routine between immediate write |
| 1034 | to the immediate comamnd registers and queuing the commands in | 1034 | to the immediate command registers and queuing the commands in |
| 1035 | the HPTXQ for execution. This last technique might be more | 1035 | the HPTXQ for execution. This last technique might be more |
| 1036 | efficient if we know we're going to submit a whole lot of | 1036 | efficient if we know we're going to submit a whole lot of |
| 1037 | commands in one go, but this driver is not setup to be able to | 1037 | commands in one go, but this driver is not setup to be able to |