aboutsummaryrefslogtreecommitdiffstats
path: root/arch/cris/include/arch-v32
diff options
context:
space:
mode:
authorJesper Nilsson <jesper.nilsson@axis.com>2010-05-25 11:48:14 -0400
committerJesper Nilsson <jesper.nilsson@axis.com>2010-05-25 11:48:14 -0400
commit4150764fbba03ce4675b02b10872c665bb05a8aa (patch)
treefb175c197b8bedf153c010d4320befc0d885f123 /arch/cris/include/arch-v32
parent392ed655262446a7d9bc678394600a1d81614313 (diff)
CRIS: Don't use mask_irq as symbol name
kernel/irq/chip.c now uses these, which lead to compile error for CRISv32. Signed-off-by: Jesper Nilsson <jesper.nilsson@axis.com>
Diffstat (limited to 'arch/cris/include/arch-v32')
-rw-r--r--arch/cris/include/arch-v32/arch/irq.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/cris/include/arch-v32/arch/irq.h b/arch/cris/include/arch-v32/arch/irq.h
index 9e4c9fbdfddf..b31e9984f849 100644
--- a/arch/cris/include/arch-v32/arch/irq.h
+++ b/arch/cris/include/arch-v32/arch/irq.h
@@ -23,8 +23,8 @@ struct etrax_interrupt_vector {
23 23
24extern struct etrax_interrupt_vector *etrax_irv; /* head.S */ 24extern struct etrax_interrupt_vector *etrax_irv; /* head.S */
25 25
26void mask_irq(int irq); 26void crisv32_mask_irq(int irq);
27void unmask_irq(int irq); 27void crisv32_unmask_irq(int irq);
28 28
29void set_exception_vector(int n, irqvectptr addr); 29void set_exception_vector(int n, irqvectptr addr);
30 30