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 remote branch 'kumar/merge' into merge
[pandora-kernel.git]
/
arch
/
mips
/
include
/
asm
/
octeon
/
cvmx.h
diff --git
a/arch/mips/include/asm/octeon/cvmx.h
b/arch/mips/include/asm/octeon/cvmx.h
index
9d9381e
..
7e12867
100644
(file)
--- a/
arch/mips/include/asm/octeon/cvmx.h
+++ b/
arch/mips/include/asm/octeon/cvmx.h
@@
-151,7
+151,7
@@
enum cvmx_mips_space {
#endif
/**
- * Convert a memory pointer (void*) into a hardware compat
a
ble
+ * Convert a memory pointer (void*) into a hardware compat
i
ble
* memory address (uint64_t). Octeon hardware widgets don't
* understand logical addresses.
*