From b2ef97ebfde1925a47fec80826f091675173c331 Mon Sep 17 00:00:00 2001
From: Doug Thompson <norsk5@xmission.com>
Date: Sat, 1 Jul 2006 04:35:45 -0700
Subject: [PATCH] --- yaml --- r: 31536 b: refs/heads/master c:
 929a40ec324e947d4ad14cc1ced785c104c560e2 h: refs/heads/master v: v3

---
 [refs]                            | 2 +-
 trunk/drivers/edac/amd76x_edac.c  | 4 ++--
 trunk/drivers/edac/e752x_edac.c   | 3 ++-
 trunk/drivers/edac/e7xxx_edac.c   | 3 ++-
 trunk/drivers/edac/edac_mc.h      | 4 ----
 trunk/drivers/edac/i82860_edac.c  | 3 ++-
 trunk/drivers/edac/i82875p_edac.c | 3 ++-
 trunk/drivers/edac/r82600_edac.c  | 3 ++-
 8 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/[refs] b/[refs]
index 751ba8060c23..19037299a05b 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e8c4b9d003e72199a705fb5a40fcd2487fa16933
+refs/heads/master: 929a40ec324e947d4ad14cc1ced785c104c560e2
diff --git a/trunk/drivers/edac/amd76x_edac.c b/trunk/drivers/edac/amd76x_edac.c
index d75864e35fef..f79f6b587bfa 100644
--- a/trunk/drivers/edac/amd76x_edac.c
+++ b/trunk/drivers/edac/amd76x_edac.c
@@ -19,8 +19,8 @@
 #include <linux/slab.h>
 #include "edac_mc.h"
 
-#define AMD76X_REVISION	" Ver: 2.0.0 "  __DATE__
-
+#define AMD76X_REVISION	" Ver: 2.0.1 "  __DATE__
+#define EDAC_MOD_STR	"amd76x_edac"
 
 #define amd76x_printk(level, fmt, arg...) \
 	edac_printk(level, "amd76x", fmt, ##arg)
diff --git a/trunk/drivers/edac/e752x_edac.c b/trunk/drivers/edac/e752x_edac.c
index 815c3eb783de..c82bc0ed7f14 100644
--- a/trunk/drivers/edac/e752x_edac.c
+++ b/trunk/drivers/edac/e752x_edac.c
@@ -24,7 +24,8 @@
 #include <linux/slab.h>
 #include "edac_mc.h"
 
-#define E752X_REVISION	" Ver: 2.0.0 " __DATE__
+#define E752X_REVISION	" Ver: 2.0.1 " __DATE__
+#define EDAC_MOD_STR	"e752x_edac"
 
 static int force_function_unhide;
 
diff --git a/trunk/drivers/edac/e7xxx_edac.c b/trunk/drivers/edac/e7xxx_edac.c
index 5a5ecd5a0409..310d91b41c96 100644
--- a/trunk/drivers/edac/e7xxx_edac.c
+++ b/trunk/drivers/edac/e7xxx_edac.c
@@ -29,7 +29,8 @@
 #include <linux/slab.h>
 #include "edac_mc.h"
 
-#define	E7XXX_REVISION " Ver: 2.0.0 " __DATE__
+#define	E7XXX_REVISION " Ver: 2.0.1 " __DATE__
+#define	EDAC_MOD_STR	"e7xxx_edac"
 
 #define e7xxx_printk(level, fmt, arg...) \
 	edac_printk(level, "e7xxx", fmt, ##arg)
diff --git a/trunk/drivers/edac/edac_mc.h b/trunk/drivers/edac/edac_mc.h
index 1be4947e28af..bf6ab8a8d5ed 100644
--- a/trunk/drivers/edac/edac_mc.h
+++ b/trunk/drivers/edac/edac_mc.h
@@ -78,10 +78,6 @@ extern int edac_debug_level;
 
 #endif  /* !CONFIG_EDAC_DEBUG */
 
-#define edac_xstr(s) edac_str(s)
-#define edac_str(s) #s
-#define EDAC_MOD_STR edac_xstr(KBUILD_BASENAME)
-
 #define BIT(x) (1 << (x))
 
 #define PCI_VEND_DEV(vend, dev) PCI_VENDOR_ID_ ## vend, \
diff --git a/trunk/drivers/edac/i82860_edac.c b/trunk/drivers/edac/i82860_edac.c
index e30a4a2eaf38..e4bb298e613f 100644
--- a/trunk/drivers/edac/i82860_edac.c
+++ b/trunk/drivers/edac/i82860_edac.c
@@ -16,7 +16,8 @@
 #include <linux/slab.h>
 #include "edac_mc.h"
 
-#define  I82860_REVISION " Ver: 2.0.0 " __DATE__
+#define  I82860_REVISION " Ver: 2.0.1 " __DATE__
+#define EDAC_MOD_STR	"i82860_edac"
 
 #define i82860_printk(level, fmt, arg...) \
 	edac_printk(level, "i82860", fmt, ##arg)
diff --git a/trunk/drivers/edac/i82875p_edac.c b/trunk/drivers/edac/i82875p_edac.c
index 9423ee5e7edd..161fe09a6d38 100644
--- a/trunk/drivers/edac/i82875p_edac.c
+++ b/trunk/drivers/edac/i82875p_edac.c
@@ -20,7 +20,8 @@
 #include <linux/slab.h>
 #include "edac_mc.h"
 
-#define I82875P_REVISION	" Ver: 2.0.0 " __DATE__
+#define I82875P_REVISION	" Ver: 2.0.1 " __DATE__
+#define EDAC_MOD_STR		"i82875p_edac"
 
 #define i82875p_printk(level, fmt, arg...) \
 	edac_printk(level, "i82875p", fmt, ##arg)
diff --git a/trunk/drivers/edac/r82600_edac.c b/trunk/drivers/edac/r82600_edac.c
index a0e248d11ed9..a49cf0a39398 100644
--- a/trunk/drivers/edac/r82600_edac.c
+++ b/trunk/drivers/edac/r82600_edac.c
@@ -22,7 +22,8 @@
 #include <linux/slab.h>
 #include "edac_mc.h"
 
-#define R82600_REVISION	" Ver: 2.0.0 " __DATE__
+#define R82600_REVISION	" Ver: 2.0.1 " __DATE__
+#define EDAC_MOD_STR	"r82600_edac"
 
 #define r82600_printk(level, fmt, arg...) \
 	edac_printk(level, "r82600", fmt, ##arg)