diff options
| author | Jesper Nilsson <jesper.nilsson@axis.com> | 2010-05-25 17:48:14 +0200 |
|---|---|---|
| committer | Jesper Nilsson <jesper.nilsson@axis.com> | 2010-05-25 17:48:14 +0200 |
| commit | 4150764fbba03ce4675b02b10872c665bb05a8aa (patch) | |
| tree | fb175c197b8bedf153c010d4320befc0d885f123 /arch/cris/include/arch-v32/arch | |
| parent | 392ed655262446a7d9bc678394600a1d81614313 (diff) | |
| download | kernel_samsung_smdk4412-4150764fbba03ce4675b02b10872c665bb05a8aa.zip kernel_samsung_smdk4412-4150764fbba03ce4675b02b10872c665bb05a8aa.tar.gz kernel_samsung_smdk4412-4150764fbba03ce4675b02b10872c665bb05a8aa.tar.bz2 | |
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/arch')
| -rw-r--r-- | arch/cris/include/arch-v32/arch/irq.h | 4 |
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 9e4c9fb..b31e998 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 { extern struct etrax_interrupt_vector *etrax_irv; /* head.S */ -void mask_irq(int irq); -void unmask_irq(int irq); +void crisv32_mask_irq(int irq); +void crisv32_unmask_irq(int irq); void set_exception_vector(int n, irqvectptr addr); |