git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'errata/tx2-219' into for-next/fixes
[sfrench/cifs-2.6.git]
/
arch
/
mips
/
include
/
asm
/
octeon
/
cvmx-ipd.h
diff --git
a/arch/mips/include/asm/octeon/cvmx-ipd.h
b/arch/mips/include/asm/octeon/cvmx-ipd.h
index cbdc14b7743532fae1c2e5ee2d1144e4a97f36ba..adab7b54c3b421ee6efe4b11ad3a4bc53034f9f1 100644
(file)
--- a/
arch/mips/include/asm/octeon/cvmx-ipd.h
+++ b/
arch/mips/include/asm/octeon/cvmx-ipd.h
@@
-36,6
+36,7
@@
#include <asm/octeon/octeon-feature.h>
#include <asm/octeon/cvmx-ipd-defs.h>
+#include <asm/octeon/cvmx-pip-defs.h>
enum cvmx_ipd_mode {
CVMX_IPD_OPC_MODE_STT = 0LL, /* All blocks DRAM, not cached in L2 */