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 'devel' of master.kernel.org:/home/rmk/linux-2.6-arm
[pandora-kernel.git]
/
arch
/
x86_64
/
kernel
/
pci-nommu.c
diff --git
a/arch/x86_64/kernel/pci-nommu.c
b/arch/x86_64/kernel/pci-nommu.c
index
fe4aa19
..
2a34c6c
100644
(file)
--- a/
arch/x86_64/kernel/pci-nommu.c
+++ b/
arch/x86_64/kernel/pci-nommu.c
@@
-6,7
+6,7
@@
#include <linux/string.h>
#include <linux/dma-mapping.h>
-#include <asm/
proto
.h>
+#include <asm/
iommu
.h>
#include <asm/processor.h>
#include <asm/dma.h>