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 'for-linus' of git://git.infradead.org/users/eparis/selinux into for...
[pandora-kernel.git]
/
arch
/
mips
/
include
/
asm
/
octeon
/
cvmx-bootinfo.h
diff --git
a/arch/mips/include/asm/octeon/cvmx-bootinfo.h
b/arch/mips/include/asm/octeon/cvmx-bootinfo.h
index
f3c23a4
..
4e4c3a8
100644
(file)
--- a/
arch/mips/include/asm/octeon/cvmx-bootinfo.h
+++ b/
arch/mips/include/asm/octeon/cvmx-bootinfo.h
@@
-200,7
+200,7
@@
enum cvmx_chip_types_enum {
CVMX_CHIP_TYPE_MAX,
};
-/* Compat
a
bility alias for NAC38 name change, planned to be removed
+/* Compat
i
bility alias for NAC38 name change, planned to be removed
* from SDK 1.7 */
#define CVMX_BOARD_TYPE_NAO38 CVMX_BOARD_TYPE_NAC38