From 81678553e929d70c94cffa9ade4973ff7639c2c1 Mon Sep 17 00:00:00 2001
From: Joe Perches <joe@perches.com>
Date: Sun, 31 Jan 2010 10:02:09 +0000
Subject: [PATCH] --- yaml --- r: 183797 b: refs/heads/master c:
 91e83432f8abc1fc93499a2323f6c4bd6026029e h: refs/heads/master i:   183795:
 a3a7c143ad3b0095253e1ec4bb06ef68964797a9 v: v3

---
 [refs]                       | 2 +-
 trunk/drivers/net/amd8111e.c | 3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)

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);
 		}