git://ftp.safe.ca
/
safe
/
jmp
/
linux-2.6
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'genirq-v28-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...
[safe/jmp/linux-2.6]
/
drivers
/
pci
/
dmar.c
diff --git
a/drivers/pci/dmar.c
b/drivers/pci/dmar.c
index
9527405
..
8b29c30
100644
(file)
--- a/
drivers/pci/dmar.c
+++ b/
drivers/pci/dmar.c
@@
-28,9
+28,9
@@
#include <linux/pci.h>
#include <linux/dmar.h>
+#include <linux/iova.h>
+#include <linux/intel-iommu.h>
#include <linux/timer.h>
-#include "iova.h"
-#include "intel-iommu.h"
#undef PREFIX
#define PREFIX "DMAR:"