diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-04-13 18:32:13 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-04-13 18:32:13 -0400 |
| commit | a84bd2ee81ea1bdbd238cd1c380ec25f50a876c5 (patch) | |
| tree | ba054d4b1a20dadec088fd4d8983fb5939227e46 /drivers/pci/intel-iommu.c | |
| parent | aec995900fbc8cffa9f0f9e797ef07a0beb2b079 (diff) | |
| parent | 7db6a7fa09884b34d2a5d4e6e4ed58664a5f0cf8 (diff) | |
Merge branch 'fix' of git://git.kernel.org/pub/scm/linux/kernel/git/ycmiao/pxa-linux-2.6 into fixes
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) { |