diff options
| author | David S. Miller <davem@davemloft.net> | 2011-04-11 16:44:25 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-04-11 16:44:25 -0400 |
| commit | 1c01a80cfec6f806246f31ff2680cd3639b30e67 (patch) | |
| tree | 0b554aad2ec1da71ecf6339d4ba51617bfe1dc3c /drivers/pci/intel-iommu.c | |
| parent | c44d79950b2daa1025e62eede73e4e4a274d1ef3 (diff) | |
| parent | 4a9f65f6304a00f6473e83b19c1e83caa1e42530 (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
drivers/net/smsc911x.c
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 7da3bef60d8..505c1c7075f 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) { |