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
/
pci-nommu.c
diff --git
a/arch/x86/kernel/pci-nommu.c
b/arch/x86/kernel/pci-nommu.c
index
aec43d5
..
792b917
100644
(file)
--- a/
arch/x86/kernel/pci-nommu.c
+++ b/
arch/x86/kernel/pci-nommu.c
@@
-7,7
+7,7
@@
#include <linux/dma-mapping.h>
#include <linux/scatterlist.h>
-#include <asm/
gart
.h>
+#include <asm/
iommu
.h>
#include <asm/processor.h>
#include <asm/dma.h>