diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-01-13 13:05:56 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-01-13 13:05:56 -0500 |
| commit | 008d23e4852d78bb2618f2035f8b2110b6a6b968 (patch) | |
| tree | 81c88f744f6f3fc84132527c1ddc0b4da410c5e2 /drivers/isdn/hardware | |
| parent | 8f685fbda43deccd130d192c9fcef1444649eaca (diff) | |
| parent | bfc672dcf323877228682aff79dff8ecd9f30ff8 (diff) | |
Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
* 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial: (43 commits)
Documentation/trace/events.txt: Remove obsolete sched_signal_send.
writeback: fix global_dirty_limits comment runtime -> real-time
ppc: fix comment typo singal -> signal
drivers: fix comment typo diable -> disable.
m68k: fix comment typo diable -> disable.
wireless: comment typo fix diable -> disable.
media: comment typo fix diable -> disable.
remove doc for obsolete dynamic-printk kernel-parameter
remove extraneous 'is' from Documentation/iostats.txt
Fix spelling milisec -> ms in snd_ps3 module parameter description
Fix spelling mistakes in comments
Revert conflicting V4L changes
i7core_edac: fix typos in comments
mm/rmap.c: fix comment
sound, ca0106: Fix assignment to 'channel'.
hrtimer: fix a typo in comment
init/Kconfig: fix typo
anon_inodes: fix wrong function name in comment
fix comment typos concerning "consistent"
poll: fix a typo in comment
...
Fix up trivial conflicts in:
- drivers/net/wireless/iwlwifi/iwl-core.c (moved to iwl-legacy.c)
- fs/ext4/ext4.h
Also fix missed 'diabled' typo in drivers/net/bnx2x/bnx2x.h while at it.
Diffstat (limited to 'drivers/isdn/hardware')
| -rw-r--r-- | drivers/isdn/hardware/mISDN/ipac.h | 4 | ||||
| -rw-r--r-- | drivers/isdn/hardware/mISDN/isar.h | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/drivers/isdn/hardware/mISDN/ipac.h b/drivers/isdn/hardware/mISDN/ipac.h index 74a6ccf9065c..8121e046b739 100644 --- a/drivers/isdn/hardware/mISDN/ipac.h +++ b/drivers/isdn/hardware/mISDN/ipac.h | |||
| @@ -29,7 +29,7 @@ struct isac_hw { | |||
| 29 | u32 type; | 29 | u32 type; |
| 30 | u32 off; /* offset to isac regs */ | 30 | u32 off; /* offset to isac regs */ |
| 31 | char *name; | 31 | char *name; |
| 32 | spinlock_t *hwlock; /* lock HW acccess */ | 32 | spinlock_t *hwlock; /* lock HW access */ |
| 33 | read_reg_func *read_reg; | 33 | read_reg_func *read_reg; |
| 34 | write_reg_func *write_reg; | 34 | write_reg_func *write_reg; |
| 35 | fifo_func *read_fifo; | 35 | fifo_func *read_fifo; |
| @@ -70,7 +70,7 @@ struct ipac_hw { | |||
| 70 | struct hscx_hw hscx[2]; | 70 | struct hscx_hw hscx[2]; |
| 71 | char *name; | 71 | char *name; |
| 72 | void *hw; | 72 | void *hw; |
| 73 | spinlock_t *hwlock; /* lock HW acccess */ | 73 | spinlock_t *hwlock; /* lock HW access */ |
| 74 | struct module *owner; | 74 | struct module *owner; |
| 75 | u32 type; | 75 | u32 type; |
| 76 | read_reg_func *read_reg; | 76 | read_reg_func *read_reg; |
diff --git a/drivers/isdn/hardware/mISDN/isar.h b/drivers/isdn/hardware/mISDN/isar.h index 4a134acd44d0..9962bdf699c7 100644 --- a/drivers/isdn/hardware/mISDN/isar.h +++ b/drivers/isdn/hardware/mISDN/isar.h | |||
| @@ -44,7 +44,7 @@ struct isar_ch { | |||
| 44 | struct isar_hw { | 44 | struct isar_hw { |
| 45 | struct isar_ch ch[2]; | 45 | struct isar_ch ch[2]; |
| 46 | void *hw; | 46 | void *hw; |
| 47 | spinlock_t *hwlock; /* lock HW acccess */ | 47 | spinlock_t *hwlock; /* lock HW access */ |
| 48 | char *name; | 48 | char *name; |
| 49 | struct module *owner; | 49 | struct module *owner; |
| 50 | read_reg_func *read_reg; | 50 | read_reg_func *read_reg; |