From 7545ff978a1d939f9bac64f056f473ba211c3646 Mon Sep 17 00:00:00 2001
From: Florian Pose <fp@igh-essen.com>
Date: Fri, 3 Aug 2007 14:11:37 +0000
Subject: [PATCH] Added ec_e1000 prefix for DPRINTK() macros.

---
 devices/e1000/e1000-2.6.13-ethercat.h | 6 +++---
 devices/e1000/e1000-2.6.18-ethercat.h | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/devices/e1000/e1000-2.6.13-ethercat.h b/devices/e1000/e1000-2.6.13-ethercat.h
index 95817e4d..6a58aced 100644
--- a/devices/e1000/e1000-2.6.13-ethercat.h
+++ b/devices/e1000/e1000-2.6.13-ethercat.h
@@ -87,14 +87,14 @@ struct e1000_adapter;
 #include "e1000_hw-2.6.13-ethercat.h"
 
 #ifdef DBG
-#define E1000_DBG(args...) printk(KERN_DEBUG "e1000: " args)
+#define E1000_DBG(args...) printk(KERN_DEBUG "ec_e1000: " args)
 #else
 #define E1000_DBG(args...)
 #endif
 
-#define E1000_ERR(args...) printk(KERN_ERR "e1000: " args)
+#define E1000_ERR(args...) printk(KERN_ERR "ec_e1000: " args)
 
-#define PFX "e1000: "
+#define PFX "ec_e1000: "
 #define DPRINTK(nlevel, klevel, fmt, args...) \
 	(void)((NETIF_MSG_##nlevel & adapter->msg_enable) && \
 	printk(KERN_##klevel PFX "%s: %s: " fmt, adapter->netdev->name, \
diff --git a/devices/e1000/e1000-2.6.18-ethercat.h b/devices/e1000/e1000-2.6.18-ethercat.h
index 599974ef..3506ddb6 100644
--- a/devices/e1000/e1000-2.6.18-ethercat.h
+++ b/devices/e1000/e1000-2.6.18-ethercat.h
@@ -86,14 +86,14 @@ struct e1000_adapter;
 #include "e1000_hw-2.6.18-ethercat.h"
 
 #ifdef DBG
-#define E1000_DBG(args...) printk(KERN_DEBUG "e1000: " args)
+#define E1000_DBG(args...) printk(KERN_DEBUG "ec_e1000: " args)
 #else
 #define E1000_DBG(args...)
 #endif
 
-#define E1000_ERR(args...) printk(KERN_ERR "e1000: " args)
+#define E1000_ERR(args...) printk(KERN_ERR "ec_e1000: " args)
 
-#define PFX "e1000: "
+#define PFX "ec_e1000: "
 #define DPRINTK(nlevel, klevel, fmt, args...) \
 	(void)((NETIF_MSG_##nlevel & adapter->msg_enable) && \
 	printk(KERN_##klevel PFX "%s: %s: " fmt, adapter->netdev->name, \
-- 
GitLab