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

[pandora-kernel.git] / drivers / net / wan / hd64572.c

diff --git a/drivers/net/wan/hd64572.c b/drivers/net/wan/hd64572.c
index e305274..efc0db1 100644 (file)
--- a/drivers/net/wan/hd64572.c
+++ b/drivers/net/wan/hd64572.c
@@ -530,8 +530,8 @@ static void sca_dump_rings(struct net_device *dev)
               sca_in(DSR_RX(port->chan), card), port->rxin,
               sca_in(DSR_RX(port->chan), card) & DSR_DE ? "" : "in");
        for (cnt = 0; cnt < port->card->rx_ring_buffers; cnt++)
-               printk(" %02X", readb(&(desc_address(port, cnt, 0)->stat)));
-       printk(KERN_CONT "\n");
+               pr_cont(" %02X", readb(&(desc_address(port, cnt, 0)->stat)));
+       pr_cont("\n");
 
        printk(KERN_DEBUG "TX ring: CDA=%u EDA=%u DSR=%02X in=%u "
               "last=%u %sactive",
@@ -541,8 +541,8 @@ static void sca_dump_rings(struct net_device *dev)
               sca_in(DSR_TX(port->chan), card) & DSR_DE ? "" : "in");
 
        for (cnt = 0; cnt < port->card->tx_ring_buffers; cnt++)
-               printk(" %02X", readb(&(desc_address(port, cnt, 1)->stat)));
-       printk("\n");
+               pr_cont(" %02X", readb(&(desc_address(port, cnt, 1)->stat)));
+       pr_cont("\n");
 
        printk(KERN_DEBUG "MSCI: MD: %02x %02x %02x,"
               " ST: %02x %02x %02x %02x %02x, FST: %02x CST: %02x %02x\n",