diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2008-01-15 00:25:39 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2008-01-15 00:25:39 -0500 |
| commit | c60ecec67ab3f6b5791ef49d502b7a61909aa13e (patch) | |
| tree | e8180ad2ec48a6063277ee51cf10dc8541dcac2f /include | |
| parent | c23f72cae9523d29ff94eec8f30ccbdaf234b20e (diff) | |
| parent | 2e4f95822cc17cb7095d50babe2d2fc4c043fa25 (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] Cacheops.h: Fix typo.
[MIPS] Cobalt: Qube1 has no serial port so don't use it
[MIPS] Cobalt: Fix ethernet interrupts for RaQ1
[MIPS] Kconfig fixes for BCM47XX platform
Diffstat (limited to 'include')
| -rw-r--r-- | include/asm-mips/cacheops.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/asm-mips/cacheops.h b/include/asm-mips/cacheops.h index df7f2deb3b56..256ad2cc6eb8 100644 --- a/include/asm-mips/cacheops.h +++ b/include/asm-mips/cacheops.h | |||
| @@ -64,7 +64,7 @@ | |||
| 64 | #define Page_Invalidate_T 0x16 | 64 | #define Page_Invalidate_T 0x16 |
| 65 | 65 | ||
| 66 | /* | 66 | /* |
| 67 | * R1000-specific cacheops | 67 | * R10000-specific cacheops |
| 68 | * | 68 | * |
| 69 | * Cacheops 0x02, 0x06, 0x0a, 0x0c-0x0e, 0x16, 0x1a and 0x1e are unused. | 69 | * Cacheops 0x02, 0x06, 0x0a, 0x0c-0x0e, 0x16, 0x1a and 0x1e are unused. |
| 70 | * Most of the _S cacheops are identical to the R4000SC _SD cacheops. | 70 | * Most of the _S cacheops are identical to the R4000SC _SD cacheops. |