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/usb | |
| 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/usb')
| -rw-r--r-- | drivers/usb/storage/usb.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/usb/storage/usb.h b/drivers/usb/storage/usb.h index 009fb0953a56..5284abe1b5eb 100644 --- a/drivers/usb/storage/usb.h +++ b/drivers/usb/storage/usb.h | |||
| @@ -160,10 +160,10 @@ struct us_data { | |||
| 160 | }; | 160 | }; |
| 161 | 161 | ||
| 162 | /* Convert between us_data and the corresponding Scsi_Host */ | 162 | /* Convert between us_data and the corresponding Scsi_Host */ |
| 163 | static struct Scsi_Host inline *us_to_host(struct us_data *us) { | 163 | static inline struct Scsi_Host *us_to_host(struct us_data *us) { |
| 164 | return container_of((void *) us, struct Scsi_Host, hostdata); | 164 | return container_of((void *) us, struct Scsi_Host, hostdata); |
| 165 | } | 165 | } |
| 166 | static struct us_data inline *host_to_us(struct Scsi_Host *host) { | 166 | static inline struct us_data *host_to_us(struct Scsi_Host *host) { |
| 167 | return (struct us_data *) host->hostdata; | 167 | return (struct us_data *) host->hostdata; |
| 168 | } | 168 | } |
| 169 | 169 | ||