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 'tracing-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...
[pandora-kernel.git]
/
arch
/
sparc
/
include
/
asm
/
pci.h
diff --git
a/arch/sparc/include/asm/pci.h
b/arch/sparc/include/asm/pci.h
index
6e14fd1
..
d9c031f
100644
(file)
--- a/
arch/sparc/include/asm/pci.h
+++ b/
arch/sparc/include/asm/pci.h
@@
-5,4
+5,7
@@
#else
#include <asm/pci_32.h>
#endif
+
+#include <asm-generic/pci-dma-compat.h>
+
#endif