diff --git a/[refs] b/[refs] index c5af43c492db..e27b57c9c893 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 06fa73589f79e58e52e6a0329594fb42f8c6d277 +refs/heads/master: 53edbecd589520833a89b57af1ee636fdc7544a5 diff --git a/trunk/drivers/net/r8169.c b/trunk/drivers/net/r8169.c index 94b79f55c71c..9c11087d3e87 100644 --- a/trunk/drivers/net/r8169.c +++ b/trunk/drivers/net/r8169.c @@ -2311,7 +2311,7 @@ static void rtl8169_reinit_task(struct work_struct *work) ret = rtl8169_open(dev); if (unlikely(ret < 0)) { if (net_ratelimit() && netif_msg_drv(tp)) { - printk(PFX KERN_ERR "%s: reinit failure (status = %d)." + printk(KERN_ERR PFX "%s: reinit failure (status = %d)." " Rescheduling.\n", dev->name, ret); } rtl8169_schedule_work(dev, rtl8169_reinit_task); @@ -2343,7 +2343,7 @@ static void rtl8169_reset_task(struct work_struct *work) netif_wake_queue(dev); } else { if (net_ratelimit() && netif_msg_intr(tp)) { - printk(PFX KERN_EMERG "%s: Rx buffers shortage\n", + printk(KERN_EMERG PFX "%s: Rx buffers shortage\n", dev->name); } rtl8169_schedule_work(dev, rtl8169_reset_task);