git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'x86/for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip...
[pandora-kernel.git]
/
arch
/
x86
/
kernel
/
amd_iommu_init.c
diff --git
a/arch/x86/kernel/amd_iommu_init.c
b/arch/x86/kernel/amd_iommu_init.c
index
7661b02
..
c9d8ff2
100644
(file)
--- a/
arch/x86/kernel/amd_iommu_init.c
+++ b/
arch/x86/kernel/amd_iommu_init.c
@@
-25,7
+25,7
@@
#include <asm/pci-direct.h>
#include <asm/amd_iommu_types.h>
#include <asm/amd_iommu.h>
-#include <asm/
gart
.h>
+#include <asm/
iommu
.h>
/*
* definitions for the ACPI scanning code