X-Git-Url: http://git.openwrt.org/?a=blobdiff_plain;f=target%2Flinux%2Fifxmips%2Ffiles%2Fdrivers%2Fchar%2Fifxmips_ssc.c;h=35b32e852930ac77d173347865b65c566eb1a9a1;hb=3bba4548c1abcb3546c334181509eafbc74ef905;hp=7b55a4d1d1feca8991b3ef508a5002b941ace1aa;hpb=00da7b6aa83e637722bbc46cd9c3faca90ed1ab1;p=openwrt%2Fsvn-archive%2Farchive.git

diff --git a/target/linux/ifxmips/files/drivers/char/ifxmips_ssc.c b/target/linux/ifxmips/files/drivers/char/ifxmips_ssc.c
index 7b55a4d1d1..35b32e8529 100644
--- a/target/linux/ifxmips/files/drivers/char/ifxmips_ssc.c
+++ b/target/linux/ifxmips/files/drivers/char/ifxmips_ssc.c
@@ -73,7 +73,7 @@ static unsigned int ifx_ssc_get_kernel_clk (struct ifx_ssc_port *info);
 static void tx_int (struct ifx_ssc_port *);
 
 extern unsigned int ifxmips_get_fpi_hz (void);
-extern void mask_and_ack_ifxmips_irq (unsigned int irq_nr);
+extern void ifxmips_mask_and_ack_irq (unsigned int irq_nr);
 
 static inline unsigned int
 ifx_ssc_get_kernel_clk (struct ifx_ssc_port *info)
@@ -297,9 +297,9 @@ ifx_ssc_abort (struct ifx_ssc_port *info)
 		wake_up_interruptible (&info->rwait);
 
 	// clear pending int's 
-	mask_and_ack_ifxmips_irq(IFXMIPS_SSC_RIR);
-	mask_and_ack_ifxmips_irq(IFXMIPS_SSC_TIR);
-	mask_and_ack_ifxmips_irq(IFXMIPS_SSC_EIR);
+	ifxmips_mask_and_ack_irq(IFXMIPS_SSC_RIR);
+	ifxmips_mask_and_ack_irq(IFXMIPS_SSC_TIR);
+	ifxmips_mask_and_ack_irq(IFXMIPS_SSC_EIR);
 
 	// clear error flags
 	ifxmips_w32(IFX_SSC_WHBSTATE_CLR_ALL_ERROR, IFXMIPS_SSC_WHBSTATE);
@@ -354,9 +354,9 @@ ifx_ssc_open (struct inode *inode, struct file *filp)
 	ifxmips_w32(IFX_SSC_WHBSTATE_CLR_ALL_ERROR, IFXMIPS_SSC_WHBSTATE);
 
 	// clear pending interrupts
-	mask_and_ack_ifxmips_irq(IFXMIPS_SSC_RIR);
-	mask_and_ack_ifxmips_irq(IFXMIPS_SSC_TIR);
-	mask_and_ack_ifxmips_irq(IFXMIPS_SSC_EIR);
+	ifxmips_mask_and_ack_irq(IFXMIPS_SSC_RIR);
+	ifxmips_mask_and_ack_irq(IFXMIPS_SSC_TIR);
+	ifxmips_mask_and_ack_irq(IFXMIPS_SSC_EIR);
 
 	ifxmips_w32(IFX_SSC_WHBSTATE_SET_ENABLE, IFXMIPS_SSC_WHBSTATE);