Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6

[karo-tx-linux.git] / arch / cris / arch-v32 / kernel / crisksyms.c

diff --git a/arch/cris/arch-v32/kernel/crisksyms.c b/arch/cris/arch-v32/kernel/crisksyms.c
index 64933e2c0f5b88e4ead5e5d5f23bbb1c5421182a..bde8d1a10cadd31edb5b0120b0bc3feab73e07f9 100644 (file)
--- a/arch/cris/arch-v32/kernel/crisksyms.c
+++ b/arch/cris/arch-v32/kernel/crisksyms.c
@@ -24,5 +24,5 @@ EXPORT_SYMBOL(crisv32_io_get_name);
 EXPORT_SYMBOL(crisv32_io_get);
 
 /* Functions masking/unmasking interrupts */
-EXPORT_SYMBOL(mask_irq);
-EXPORT_SYMBOL(unmask_irq);
+EXPORT_SYMBOL(crisv32_mask_irq);
+EXPORT_SYMBOL(crisv32_unmask_irq);