Merge branch 'topic/misc' into topic/pcsp-fix

[linux-2.6-omap-h63xx.git] / drivers / net / wan / dscc4.c

diff --git a/drivers/net/wan/dscc4.c b/drivers/net/wan/dscc4.c
index f5d55ad02267edb623128570104fbb8e095c8ff0..5f1ccb2b08b11d1dbe0f4a7cab308b6ec92105ef 100644 (file)
--- a/drivers/net/wan/dscc4.c
+++ b/drivers/net/wan/dscc4.c
@@ -647,7 +647,7 @@ static inline void dscc4_rx_skb(struct dscc4_dev_priv *dpriv,
 
        skb = dpriv->rx_skbuff[dpriv->rx_current++%RX_RING_SIZE];
        if (!skb) {
-               printk(KERN_DEBUG "%s: skb=0 (%s)\n", dev->name, __FUNCTION__);
+               printk(KERN_DEBUG "%s: skb=0 (%s)\n", dev->name, __func__);
                goto refill;
        }
        pkt_len = TO_SIZE(le32_to_cpu(rx_fd->state2));