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 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus
[pandora-kernel.git]
/
arch
/
mips
/
include
/
asm
/
octeon
/
octeon.h
diff --git
a/arch/mips/include/asm/octeon/octeon.h
b/arch/mips/include/asm/octeon/octeon.h
index
2e3a692
..
790939d
100644
(file)
--- a/
arch/mips/include/asm/octeon/octeon.h
+++ b/
arch/mips/include/asm/octeon/octeon.h
@@
-8,7
+8,7
@@
#ifndef __ASM_OCTEON_OCTEON_H
#define __ASM_OCTEON_OCTEON_H
-#include
"cvmx.h"
+#include
<asm/octeon/cvmx.h>
extern uint64_t octeon_bootmem_alloc_range_phys(uint64_t size,
uint64_t alignment,