diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-03-21 00:12:50 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-03-21 00:12:50 -0400 |
commit | 69a7aebcf019ab3ff5764525ad6858fbe23bb86d (patch) | |
tree | 7211df5704b743a7667159748c670a9744164482 /drivers/iommu | |
parent | d464c92b5234227c1698862a1906827e2e398ae0 (diff) | |
parent | f1f996b66cc3908a8f5ffccc2ff41840e92f3b10 (diff) |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
Pull trivial tree from Jiri Kosina:
"It's indeed trivial -- mostly documentation updates and a bunch of
typo fixes from Masanari.
There are also several linux/version.h include removals from Jesper."
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial: (101 commits)
kcore: fix spelling in read_kcore() comment
constify struct pci_dev * in obvious cases
Revert "char: Fix typo in viotape.c"
init: fix wording error in mm_init comment
usb: gadget: Kconfig: fix typo for 'different'
Revert "power, max8998: Include linux/module.h just once in drivers/power/max8998_charger.c"
writeback: fix fn name in writeback_inodes_sb_nr_if_idle() comment header
writeback: fix typo in the writeback_control comment
Documentation: Fix multiple typo in Documentation
tpm_tis: fix tis_lock with respect to RCU
Revert "media: Fix typo in mixer_drv.c and hdmi_drv.c"
Doc: Update numastat.txt
qla4xxx: Add missing spaces to error messages
compiler.h: Fix typo
security: struct security_operations kerneldoc fix
Documentation: broken URL in libata.tmpl
Documentation: broken URL in filesystems.tmpl
mtd: simplify return logic in do_map_probe()
mm: fix comment typo of truncate_inode_pages_range
power: bq27x00: Fix typos in comment
...
Diffstat (limited to 'drivers/iommu')
-rw-r--r-- | drivers/iommu/intel-iommu.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/iommu/intel-iommu.c b/drivers/iommu/intel-iommu.c index a08a53448b72..132f93b05154 100644 --- a/drivers/iommu/intel-iommu.c +++ b/drivers/iommu/intel-iommu.c | |||
@@ -1247,7 +1247,7 @@ static int iommu_init_domains(struct intel_iommu *iommu) | |||
1247 | unsigned long nlongs; | 1247 | unsigned long nlongs; |
1248 | 1248 | ||
1249 | ndomains = cap_ndoms(iommu->cap); | 1249 | ndomains = cap_ndoms(iommu->cap); |
1250 | pr_debug("IOMMU %d: Number of Domains supportd <%ld>\n", iommu->seq_id, | 1250 | pr_debug("IOMMU %d: Number of Domains supported <%ld>\n", iommu->seq_id, |
1251 | ndomains); | 1251 | ndomains); |
1252 | nlongs = BITS_TO_LONGS(ndomains); | 1252 | nlongs = BITS_TO_LONGS(ndomains); |
1253 | 1253 | ||