diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-07-28 15:14:43 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-07-28 15:14:43 -0400 |
| commit | 414f746d232d41ed6ae8632c4495ae795373c44b (patch) | |
| tree | 167f9bc8f139c6e82e6732b38c7a938b8a9d31cd /arch/blackfin/kernel/cplb-nompu/cplbhdlr.S | |
| parent | 5a7a201c51c324876d00a54e7208af6af12d1ca4 (diff) | |
| parent | c9272c4f9fbe2087beb3392f526dc5b19efaa56b (diff) | |
Merge branch 'linus' into cpus4096
Diffstat (limited to 'arch/blackfin/kernel/cplb-nompu/cplbhdlr.S')
| -rw-r--r-- | arch/blackfin/kernel/cplb-nompu/cplbhdlr.S | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/blackfin/kernel/cplb-nompu/cplbhdlr.S b/arch/blackfin/kernel/cplb-nompu/cplbhdlr.S index 2788532de72b..ecbabc0a1fed 100644 --- a/arch/blackfin/kernel/cplb-nompu/cplbhdlr.S +++ b/arch/blackfin/kernel/cplb-nompu/cplbhdlr.S | |||
| @@ -125,6 +125,6 @@ ENTRY(__cplb_hdr) | |||
| 125 | SP += -12; | 125 | SP += -12; |
| 126 | call _panic_cplb_error; | 126 | call _panic_cplb_error; |
| 127 | SP += 12; | 127 | SP += 12; |
| 128 | JUMP _handle_bad_cplb; | 128 | JUMP.L _handle_bad_cplb; |
| 129 | 129 | ||
| 130 | ENDPROC(__cplb_hdr) | 130 | ENDPROC(__cplb_hdr) |