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 git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6
[pandora-kernel.git]
/
arch
/
mips
/
cavium-octeon
/
dma-octeon.c
diff --git
a/arch/mips/cavium-octeon/dma-octeon.c
b/arch/mips/cavium-octeon/dma-octeon.c
index
627c162
..
4b92bfc
100644
(file)
--- a/
arch/mips/cavium-octeon/dma-octeon.c
+++ b/
arch/mips/cavium-octeon/dma-octeon.c
@@
-29,7
+29,7
@@
#include <dma-coherence.h>
#ifdef CONFIG_PCI
-#include
"pci-common.h"
+#include
<asm/octeon/pci-octeon.h>
#endif
#define BAR2_PCI_ADDRESS 0x8000000000ul