From e00665eedda7bd395bc52904ac1778f8759d2ed7 Mon Sep 17 00:00:00 2001
From: Joe Perches <joe@perches.com>
Date: Mon, 22 Mar 2010 20:08:04 -0700
Subject: [PATCH] --- yaml --- r: 193770 b: refs/heads/master c:
 300bc0602489d9f09f7b548f790afd2952f6070b h: refs/heads/master v: v3

---
 [refs]                                   | 2 +-
 trunk/drivers/net/ixgbevf/ixgbevf_main.c | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index d110f31b35a5..cf3efff92b7b 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 38013262c2c815fa404fa9f42dbc958c616fb385
+refs/heads/master: 300bc0602489d9f09f7b548f790afd2952f6070b
diff --git a/trunk/drivers/net/ixgbevf/ixgbevf_main.c b/trunk/drivers/net/ixgbevf/ixgbevf_main.c
index d6cbd943a6f0..19e93a43e56c 100644
--- a/trunk/drivers/net/ixgbevf/ixgbevf_main.c
+++ b/trunk/drivers/net/ixgbevf/ixgbevf_main.c
@@ -2417,9 +2417,9 @@ static void ixgbevf_watchdog_task(struct work_struct *work)
 
 	if (link_up) {
 		if (!netif_carrier_ok(netdev)) {
-			hw_dbg(&adapter->hw, "NIC Link is Up %s, ",
-			       ((link_speed == IXGBE_LINK_SPEED_10GB_FULL) ?
-				"10 Gbps\n" : "1 Gbps\n"));
+			hw_dbg(&adapter->hw, "NIC Link is Up, %u Gbps\n",
+			       (link_speed == IXGBE_LINK_SPEED_10GB_FULL) ?
+			       10 : 1);
 			netif_carrier_on(netdev);
 			netif_tx_wake_all_queues(netdev);
 		} else {