aboutsummaryrefslogtreecommitdiffstats
path: root/include/scsi
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2014-12-12 13:08:06 -0500
committerLinus Torvalds <torvalds@linux-foundation.org>2014-12-12 13:08:06 -0500
commita7cb7bb664543e4562ab0e9a072470d2d18c761f (patch)
tree7c72fbbc681617be8c89b63c7e98a7e7b09c72de /include/scsi
parentccb5a4910d0ca7b1742b9217db2e1b95817e25ac (diff)
parent078014dd36989c66378dfe80066c3f8a1f6952e8 (diff)
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
Pull trivial tree update from Jiri Kosina: "Usual stuff: documentation updates, printk() fixes, etc" * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial: (24 commits) intel_ips: fix a type in error message cpufreq: cpufreq-dt: Move newline to end of error message ps3rom: fix error return code treewide: fix typo in printk and Kconfig ARM: dts: bcm63138: change "interupts" to "interrupts" Replace mentions of "list_struct" to "list_head" kernel: trace: fix printk message scsi: mpt2sas: fix ioctl in comment zbud, zswap: change module author email clocksource: Fix 'clcoksource' typo in comment arm: fix wording of "Crotex" in CONFIG_ARCH_EXYNOS3 help gpio: msm-v1: make boolean argument more obvious usb: Fix typo in usb-serial-simple.c PCI: Fix comment typo 'COMFIG_PM_OPS' powerpc: Fix comment typo 'CONIFG_8xx' powerpc: Fix comment typos 'CONFiG_ALTIVEC' clk: st: Spelling s/stucture/structure/ isci: Spelling s/stucture/structure/ usb: gadget: zero: Spelling s/infrastucture/infrastructure/ treewide: Fix company name in module descriptions ...
Diffstat (limited to 'include/scsi')
-rw-r--r--include/scsi/scsi_host.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/scsi/scsi_host.h b/include/scsi/scsi_host.h
index c8a462ef9a4e..e939d2b3757a 100644
--- a/include/scsi/scsi_host.h
+++ b/include/scsi/scsi_host.h
@@ -554,7 +554,7 @@ struct Scsi_Host {
554 * __devices is protected by the host_lock, but you should 554 * __devices is protected by the host_lock, but you should
555 * usually use scsi_device_lookup / shost_for_each_device 555 * usually use scsi_device_lookup / shost_for_each_device
556 * to access it and don't care about locking yourself. 556 * to access it and don't care about locking yourself.
557 * In the rare case of beeing in irq context you can use 557 * In the rare case of being in irq context you can use
558 * their __ prefixed variants with the lock held. NEVER 558 * their __ prefixed variants with the lock held. NEVER
559 * access this list directly from a driver. 559 * access this list directly from a driver.
560 */ 560 */