diff options
| author | Ingo Molnar <mingo@elte.hu> | 2011-05-10 16:15:57 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2011-05-10 16:15:57 -0400 |
| commit | 2c14ddc135d93cb4b33ee4bd4a2b05e21a4a762c (patch) | |
| tree | 47cc9da388b0bae4bbb2255e1fbe9eef724d088c /drivers/pci/intel-iommu.c | |
| parent | 54b333529df25b21da462c7dcc16c7dc779d9f26 (diff) | |
| parent | 72fe00f01f9a3240a1073be27aeaf4fc476cc662 (diff) | |
Merge branch 'iommu/2.6.40' of git://git.kernel.org/pub/scm/linux/kernel/git/joro/linux-2.6-iommu into core/iommu
Diffstat (limited to 'drivers/pci/intel-iommu.c')
| -rw-r--r-- | drivers/pci/intel-iommu.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/pci/intel-iommu.c b/drivers/pci/intel-iommu.c index d552d2c77844..6af6b628175b 100644 --- a/drivers/pci/intel-iommu.c +++ b/drivers/pci/intel-iommu.c | |||
| @@ -39,6 +39,7 @@ | |||
| 39 | #include <linux/syscore_ops.h> | 39 | #include <linux/syscore_ops.h> |
| 40 | #include <linux/tboot.h> | 40 | #include <linux/tboot.h> |
| 41 | #include <linux/dmi.h> | 41 | #include <linux/dmi.h> |
| 42 | #include <linux/pci-ats.h> | ||
| 42 | #include <asm/cacheflush.h> | 43 | #include <asm/cacheflush.h> |
| 43 | #include <asm/iommu.h> | 44 | #include <asm/iommu.h> |
| 44 | #include "pci.h" | 45 | #include "pci.h" |