mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-29 11:11:45 -04:00
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: (31 commits) trivial: remove the trivial patch monkey's name from SubmittingPatches trivial: Fix a typo in comment of addrconf_dad_start() trivial: usb: fix missing space typo in doc trivial: pci hotplug: adding __init/__exit macros to sgi_hotplug trivial: Remove the hyphen from git commands trivial: fix ETIMEOUT -> ETIMEDOUT typos trivial: Kconfig: .ko is normally not included in module names trivial: SubmittingPatches: fix typo trivial: Documentation/dell_rbu.txt: fix typos trivial: Fix Pavel's address in MAINTAINERS trivial: ftrace:fix description of trace directory trivial: unnecessary (void*) cast removal in sound/oss/msnd.c trivial: input/misc: Fix typo in Kconfig trivial: fix grammo in bus_for_each_dev() kerneldoc trivial: rbtree.txt: fix rb_entry() parameters in sample code trivial: spelling fix in ppc code comments trivial: fix typo in bio_alloc kernel doc trivial: Documentation/rbtree.txt: cleanup kerneldoc of rbtree.txt trivial: Miscellaneous documentation typo fixes trivial: fix typo milisecond/millisecond for documentation and source comments. ...
This commit is contained in:
commit
489f7ab6c1
153 changed files with 228 additions and 227 deletions
|
|
@ -342,7 +342,7 @@ uLONG osdGetThreadID(void);
|
|||
/* wakes up the specifed thread */
|
||||
void osdWakeThread(uLONG);
|
||||
|
||||
/* osd sleep for x miliseconds */
|
||||
/* osd sleep for x milliseconds */
|
||||
void osdSleep(uLONG);
|
||||
|
||||
#define DPT_THREAD_PRIORITY_LOWEST 0x00
|
||||
|
|
|
|||
|
|
@ -1174,8 +1174,8 @@ lpfc_cmd_blksize(struct scsi_cmnd *sc)
|
|||
* @reftag: out: ref tag (reference tag)
|
||||
*
|
||||
* Description:
|
||||
* Extract DIF paramters from the command if possible. Otherwise,
|
||||
* use default paratmers.
|
||||
* Extract DIF parameters from the command if possible. Otherwise,
|
||||
* use default parameters.
|
||||
*
|
||||
**/
|
||||
static inline void
|
||||
|
|
|
|||
|
|
@ -469,7 +469,7 @@ typedef struct {
|
|||
u8 type; /* Type of the device */
|
||||
u8 cur_status; /* current status of the device */
|
||||
u8 tag_depth; /* Level of tagging */
|
||||
u8 sync_neg; /* sync negotiation - ENABLE or DISBALE */
|
||||
u8 sync_neg; /* sync negotiation - ENABLE or DISABLE */
|
||||
u32 size; /* configurable size in terms of 512 byte
|
||||
blocks */
|
||||
}__attribute__ ((packed)) phys_drv;
|
||||
|
|
|
|||
|
|
@ -686,7 +686,7 @@ typedef struct {
|
|||
* @type : Type of the device
|
||||
* @cur_status : current status of the device
|
||||
* @tag_depth : Level of tagging
|
||||
* @sync_neg : sync negotiation - ENABLE or DISBALE
|
||||
* @sync_neg : sync negotiation - ENABLE or DISABLE
|
||||
* @size : configurable size in terms of 512 byte
|
||||
*/
|
||||
typedef struct {
|
||||
|
|
|
|||
Loading…
Reference in a new issue