diff options
| author | James Morris <jmorris@namei.org> | 2011-04-19 07:32:41 -0400 |
|---|---|---|
| committer | James Morris <jmorris@namei.org> | 2011-04-19 07:32:41 -0400 |
| commit | d4ab4e6a23f805abb8fc3cc34525eec3788aeca1 (patch) | |
| tree | eefd82c155bc27469a85667d759cd90facf4a6e3 /drivers/pci/intel-iommu.c | |
| parent | c0fa797ae6cd02ff87c0bfe0d509368a3b45640e (diff) | |
| parent | 96fd2d57b8252e16dfacf8941f7a74a6119197f5 (diff) | |
Merge branch 'master'; commit 'v2.6.39-rc3' into next
Diffstat (limited to 'drivers/pci/intel-iommu.c')
| -rw-r--r-- | drivers/pci/intel-iommu.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/pci/intel-iommu.c b/drivers/pci/intel-iommu.c index 7da3bef60d87..505c1c7075f0 100644 --- a/drivers/pci/intel-iommu.c +++ b/drivers/pci/intel-iommu.c | |||
| @@ -2265,7 +2265,7 @@ int __init init_dmars(void) | |||
| 2265 | /* | 2265 | /* |
| 2266 | * TBD: | 2266 | * TBD: |
| 2267 | * we could share the same root & context tables | 2267 | * we could share the same root & context tables |
| 2268 | * amoung all IOMMU's. Need to Split it later. | 2268 | * among all IOMMU's. Need to Split it later. |
| 2269 | */ | 2269 | */ |
| 2270 | ret = iommu_alloc_root_entry(iommu); | 2270 | ret = iommu_alloc_root_entry(iommu); |
| 2271 | if (ret) { | 2271 | if (ret) { |