diff --git a/[refs] b/[refs] index 3cbd450455e5..71ac209a7ee5 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 24c4a3b29255f9f8bc48d93597a58256b5a1f83f +refs/heads/master: 91e83432f8abc1fc93499a2323f6c4bd6026029e diff --git a/trunk/drivers/net/amd8111e.c b/trunk/drivers/net/amd8111e.c index 545c791f477e..bb27b27d9672 100644 --- a/trunk/drivers/net/amd8111e.c +++ b/trunk/drivers/net/amd8111e.c @@ -1176,8 +1176,7 @@ static irqreturn_t amd8111e_interrupt(int irq, void *dev_id) /* Schedule a polling routine */ __napi_schedule(&lp->napi); } else if (intren0 & RINTEN0) { - printk("************Driver bug! \ - interrupt while in poll\n"); + printk("************Driver bug! interrupt while in poll\n"); /* Fix by disable receive interrupts */ writel(RINTEN0, mmio + INTEN0); }