Added ec_e1000 prefix for DPRINTK() macros.
--- a/devices/e1000/e1000-2.6.13-ethercat.h Fri Aug 03 13:31:13 2007 +0000
+++ b/devices/e1000/e1000-2.6.13-ethercat.h Fri Aug 03 14:11:37 2007 +0000
@@ -87,14 +87,14 @@
#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 PFX "e1000: "
+#define E1000_ERR(args...) printk(KERN_ERR "ec_e1000: " args)
+
+#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, \
--- a/devices/e1000/e1000-2.6.18-ethercat.h Fri Aug 03 13:31:13 2007 +0000
+++ b/devices/e1000/e1000-2.6.18-ethercat.h Fri Aug 03 14:11:37 2007 +0000
@@ -86,14 +86,14 @@
#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 PFX "e1000: "
+#define E1000_ERR(args...) printk(KERN_ERR "ec_e1000: " args)
+
+#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, \