diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-02-21 13:13:22 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-02-21 13:13:22 -0500 |
| commit | 808c783e9bfb217a90be5a996a867c41a69b40bd (patch) | |
| tree | 0aaeaa1a4bd4324f727e9bb9d46d29baea03e9b7 /arch/mips/mm/cex-sb1.S | |
| parent | 52aa536f5a78bbba9205d296f53d2f8a424a3b08 (diff) | |
| parent | 8db41685c73ad1893d8571861171e183a551e90d (diff) | |
Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus
Diffstat (limited to 'arch/mips/mm/cex-sb1.S')
| -rw-r--r-- | arch/mips/mm/cex-sb1.S | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/mips/mm/cex-sb1.S b/arch/mips/mm/cex-sb1.S index 0e71580774ff..e54a62f2807c 100644 --- a/arch/mips/mm/cex-sb1.S +++ b/arch/mips/mm/cex-sb1.S | |||
| @@ -64,7 +64,7 @@ LEAF(except_vec2_sb1) | |||
| 64 | sd k0,0x170($0) | 64 | sd k0,0x170($0) |
| 65 | sd k1,0x178($0) | 65 | sd k1,0x178($0) |
| 66 | 66 | ||
| 67 | #if CONFIG_SB1_CEX_ALWAYS_FATAL | 67 | #ifdef CONFIG_SB1_CEX_ALWAYS_FATAL |
| 68 | j handle_vec2_sb1 | 68 | j handle_vec2_sb1 |
| 69 | nop | 69 | nop |
| 70 | #else | 70 | #else |