From 4b6c0b164b05e314ac6d560f4a677dc96d073153 Mon Sep 17 00:00:00 2001
From: Jesse Brandeburg <jesse.brandeburg@intel.com>
Date: Thu, 21 Feb 2008 15:10:52 -0800
Subject: [PATCH] --- yaml --- r: 86454 b: refs/heads/master c:
 03ae221fe9987e22679642b5b687aebbb67bbb47 h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index 0554f3b327cc..354ddefcbb3a 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 31f8c4fe5d24376c15e18e2936cfa18cd7e5d917
+refs/heads/master: 03ae221fe9987e22679642b5b687aebbb67bbb47
diff --git a/trunk/drivers/net/e1000e/e1000.h b/trunk/drivers/net/e1000e/e1000.h
index 8b88c226e858..327c0620da31 100644
--- a/trunk/drivers/net/e1000e/e1000.h
+++ b/trunk/drivers/net/e1000e/e1000.h
@@ -42,8 +42,7 @@
 struct e1000_info;
 
 #define ndev_printk(level, netdev, format, arg...) \
-	printk(level "%s: %s: " format, (netdev)->dev.parent->bus_id, \
-	       (netdev)->name, ## arg)
+	printk(level "%s: " format, (netdev)->name, ## arg)
 
 #ifdef DEBUG
 #define ndev_dbg(netdev, format, arg...) \