From 4a41c4f977d074ea0c2bd7e96aeeaa447b8a90a8 Mon Sep 17 00:00:00 2001
From: Joe Perches <joe@perches.com>
Date: Fri, 21 Oct 2011 20:04:09 +0000
Subject: [PATCH] --- yaml --- r: 277574 b: refs/heads/master c:
 82bbcdebbac75bf7636bf63ac0e6e4a49b128978 h: refs/heads/master v: v3

---
 [refs]                                             | 2 +-
 trunk/drivers/net/ethernet/intel/igb/e1000_82575.c | 5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 56a042a8ccda..81f1c9046889 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 876d2d6f6e60b1170f7ed664b9659def92b87be3
+refs/heads/master: 82bbcdebbac75bf7636bf63ac0e6e4a49b128978
diff --git a/trunk/drivers/net/ethernet/intel/igb/e1000_82575.c b/trunk/drivers/net/ethernet/intel/igb/e1000_82575.c
index 7881fb95a25b..b8e20f037d0a 100644
--- a/trunk/drivers/net/ethernet/intel/igb/e1000_82575.c
+++ b/trunk/drivers/net/ethernet/intel/igb/e1000_82575.c
@@ -29,6 +29,8 @@
  * e1000_82576
  */
 
+#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
+
 #include <linux/types.h>
 #include <linux/if_ether.h>
 
@@ -244,8 +246,7 @@ static s32 igb_get_invariants_82575(struct e1000_hw *hw)
 	 * Check for invalid size
 	 */
 	if ((hw->mac.type == e1000_82576) && (size > 15)) {
-		printk("igb: The NVM size is not valid, "
-			"defaulting to 32K.\n");
+		pr_notice("The NVM size is not valid, defaulting to 32K\n");
 		size = 15;
 	}
 	nvm->word_size = 1 << size;