diff options
author | Mike Frysinger <vapier@gentoo.org> | 2010-10-19 14:44:23 -0400 |
---|---|---|
committer | Mike Frysinger <vapier@gentoo.org> | 2010-10-22 16:30:02 -0400 |
commit | 39c999697bf43a97b877fa43cbc9c2a4d1a3a461 (patch) | |
tree | d0f2432e89f7f36f9f2a39aed80527d072273bb0 /arch/blackfin/mach-common/ints-priority.c | |
parent | 9ebcaa47ba831b6ad5cc414b3c3ff310a9d5d582 (diff) |
Blackfin: bf561: rewrite SICA_xxx to just SIC_xxx
This matches all the other Blackfin ports and keep us from having to write
bf561-specific code in many places.
Signed-off-by: Mike Frysinger <vapier@gentoo.org>
Diffstat (limited to 'arch/blackfin/mach-common/ints-priority.c')
-rw-r--r-- | arch/blackfin/mach-common/ints-priority.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/blackfin/mach-common/ints-priority.c b/arch/blackfin/mach-common/ints-priority.c index 0df4fb57f5ba..da7e3c63746b 100644 --- a/arch/blackfin/mach-common/ints-priority.c +++ b/arch/blackfin/mach-common/ints-priority.c | |||
@@ -1299,7 +1299,7 @@ void do_irq(int vec, struct pt_regs *fp) | |||
1299 | } else { | 1299 | } else { |
1300 | struct ivgx *ivg = ivg7_13[vec - IVG7].ifirst; | 1300 | struct ivgx *ivg = ivg7_13[vec - IVG7].ifirst; |
1301 | struct ivgx *ivg_stop = ivg7_13[vec - IVG7].istop; | 1301 | struct ivgx *ivg_stop = ivg7_13[vec - IVG7].istop; |
1302 | #if defined(SIC_ISR0) || defined(SICA_ISR0) | 1302 | #if defined(SIC_ISR0) |
1303 | unsigned long sic_status[3]; | 1303 | unsigned long sic_status[3]; |
1304 | 1304 | ||
1305 | if (smp_processor_id()) { | 1305 | if (smp_processor_id()) { |
@@ -1379,7 +1379,7 @@ asmlinkage int __ipipe_grab_irq(int vec, struct pt_regs *regs) | |||
1379 | if (likely(vec == EVT_IVTMR_P)) | 1379 | if (likely(vec == EVT_IVTMR_P)) |
1380 | irq = IRQ_CORETMR; | 1380 | irq = IRQ_CORETMR; |
1381 | else { | 1381 | else { |
1382 | #if defined(SIC_ISR0) || defined(SICA_ISR0) | 1382 | #if defined(SIC_ISR0) |
1383 | unsigned long sic_status[3]; | 1383 | unsigned long sic_status[3]; |
1384 | 1384 | ||
1385 | sic_status[0] = bfin_read_SIC_ISR0() & bfin_read_SIC_IMASK0(); | 1385 | sic_status[0] = bfin_read_SIC_ISR0() & bfin_read_SIC_IMASK0(); |