diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-10-13 13:14:25 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-10-13 13:14:25 -0400 |
| commit | ffb035591f2736921d5dadcf8597bc1da1ba71e5 (patch) | |
| tree | 1751005ff69b6b1e55325c45c65c9e83e2a5adf0 /include | |
| parent | bcd11eaa222fce31d0b59cdbfdf9b8c47067f15a (diff) | |
| parent | ece8a9e4f011b038396c7649a8407ca9171be4a9 (diff) | |
Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus
* 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus:
[MIPS] SMP: Fix use of cpumasks.
[MIPS] Revert "[MIPS] tlbex.c: Cleanup __init usage."
[MIPS] CFE: Add missing parenthesis.
Diffstat (limited to 'include')
| -rw-r--r-- | include/asm-mips/fw/cfe/cfe_api.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/asm-mips/fw/cfe/cfe_api.h b/include/asm-mips/fw/cfe/cfe_api.h index 41cf050b6810..1003e7156bfc 100644 --- a/include/asm-mips/fw/cfe/cfe_api.h +++ b/include/asm-mips/fw/cfe/cfe_api.h | |||
| @@ -154,7 +154,7 @@ int64_t cfe_getticks(void); | |||
| 154 | #define cfe_readblk(a, b, c, d) __cfe_readblk(a, b, c, d) | 154 | #define cfe_readblk(a, b, c, d) __cfe_readblk(a, b, c, d) |
| 155 | #define cfe_setenv(a, b) __cfe_setenv(a, b) | 155 | #define cfe_setenv(a, b) __cfe_setenv(a, b) |
| 156 | #define cfe_write(a, b, c) __cfe_write(a, b, c) | 156 | #define cfe_write(a, b, c) __cfe_write(a, b, c) |
| 157 | #define cfe_writeblk(a, b, c, d __cfe_writeblk(a, b, c, d) | 157 | #define cfe_writeblk(a, b, c, d) __cfe_writeblk(a, b, c, d) |
| 158 | #endif /* CFE_API_IMPL_NAMESPACE */ | 158 | #endif /* CFE_API_IMPL_NAMESPACE */ |
| 159 | 159 | ||
| 160 | int cfe_close(int handle); | 160 | int cfe_close(int handle); |