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/atm | |
| 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/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 7f7ec288824d..f2eeaf9dc56a 100644 --- a/drivers/atm/firestream.c +++ b/drivers/atm/firestream.c | |||
| @@ -951,7 +951,7 @@ static int fs_open(struct atm_vcc *atm_vcc) | |||
| 951 | it most likely that the chip will notice it. It also prevents us | 951 | it most likely that the chip will notice it. It also prevents us |
| 952 | from having to wait for completion. On the other hand, we may | 952 | from having to wait for completion. On the other hand, we may |
| 953 | need to wait for completion anyway, to see if it completed | 953 | need to wait for completion anyway, to see if it completed |
| 954 | succesfully. */ | 954 | successfully. */ |
| 955 | 955 | ||
| 956 | switch (atm_vcc->qos.aal) { | 956 | switch (atm_vcc->qos.aal) { |
| 957 | case ATM_AAL2: | 957 | case ATM_AAL2: |