aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--drivers/edac/amd76x_edac.c4
-rw-r--r--drivers/edac/e752x_edac.c4
-rw-r--r--drivers/edac/e7xxx_edac.c4
-rw-r--r--drivers/edac/edac_mc.h6
-rw-r--r--drivers/edac/i82860_edac.c4
-rw-r--r--drivers/edac/i82875p_edac.c4
-rw-r--r--drivers/edac/r82600_edac.c4
7 files changed, 15 insertions, 15 deletions
diff --git a/drivers/edac/amd76x_edac.c b/drivers/edac/amd76x_edac.c
index 60535bb9275f..da171a56b636 100644
--- a/drivers/edac/amd76x_edac.c
+++ b/drivers/edac/amd76x_edac.c
@@ -233,7 +233,7 @@ static int amd76x_probe1(struct pci_dev *pdev, int dev_idx)
233 mci->edac_cap = ems_mode ? 233 mci->edac_cap = ems_mode ?
234 (EDAC_FLAG_EC | EDAC_FLAG_SECDED) : EDAC_FLAG_NONE; 234 (EDAC_FLAG_EC | EDAC_FLAG_SECDED) : EDAC_FLAG_NONE;
235 235
236 mci->mod_name = BS_MOD_STR; 236 mci->mod_name = EDAC_MOD_STR;
237 mci->mod_ver = "$Revision: 1.4.2.5 $"; 237 mci->mod_ver = "$Revision: 1.4.2.5 $";
238 mci->ctl_name = amd76x_devs[dev_idx].ctl_name; 238 mci->ctl_name = amd76x_devs[dev_idx].ctl_name;
239 mci->edac_check = amd76x_check; 239 mci->edac_check = amd76x_check;
@@ -339,7 +339,7 @@ MODULE_DEVICE_TABLE(pci, amd76x_pci_tbl);
339 339
340 340
341static struct pci_driver amd76x_driver = { 341static struct pci_driver amd76x_driver = {
342 .name = BS_MOD_STR, 342 .name = EDAC_MOD_STR,
343 .probe = amd76x_init_one, 343 .probe = amd76x_init_one,
344 .remove = __devexit_p(amd76x_remove_one), 344 .remove = __devexit_p(amd76x_remove_one),
345 .id_table = amd76x_pci_tbl, 345 .id_table = amd76x_pci_tbl,
diff --git a/drivers/edac/e752x_edac.c b/drivers/edac/e752x_edac.c
index 25edba55b18c..48373fdc6343 100644
--- a/drivers/edac/e752x_edac.c
+++ b/drivers/edac/e752x_edac.c
@@ -788,7 +788,7 @@ static int e752x_probe1(struct pci_dev *pdev, int dev_idx)
788 mci->edac_ctl_cap = EDAC_FLAG_NONE | EDAC_FLAG_SECDED | 788 mci->edac_ctl_cap = EDAC_FLAG_NONE | EDAC_FLAG_SECDED |
789 EDAC_FLAG_S4ECD4ED; 789 EDAC_FLAG_S4ECD4ED;
790 /* FIXME - what if different memory types are in different csrows? */ 790 /* FIXME - what if different memory types are in different csrows? */
791 mci->mod_name = BS_MOD_STR; 791 mci->mod_name = EDAC_MOD_STR;
792 mci->mod_ver = "$Revision: 1.5.2.11 $"; 792 mci->mod_ver = "$Revision: 1.5.2.11 $";
793 mci->pdev = pdev; 793 mci->pdev = pdev;
794 794
@@ -1043,7 +1043,7 @@ MODULE_DEVICE_TABLE(pci, e752x_pci_tbl);
1043 1043
1044 1044
1045static struct pci_driver e752x_driver = { 1045static struct pci_driver e752x_driver = {
1046 .name = BS_MOD_STR, 1046 .name = EDAC_MOD_STR,
1047 .probe = e752x_init_one, 1047 .probe = e752x_init_one,
1048 .remove = __devexit_p(e752x_remove_one), 1048 .remove = __devexit_p(e752x_remove_one),
1049 .id_table = e752x_pci_tbl, 1049 .id_table = e752x_pci_tbl,
diff --git a/drivers/edac/e7xxx_edac.c b/drivers/edac/e7xxx_edac.c
index e7537413cad2..8001797a6bc5 100644
--- a/drivers/edac/e7xxx_edac.c
+++ b/drivers/edac/e7xxx_edac.c
@@ -383,7 +383,7 @@ static int e7xxx_probe1(struct pci_dev *pdev, int dev_idx)
383 mci->edac_ctl_cap = 383 mci->edac_ctl_cap =
384 EDAC_FLAG_NONE | EDAC_FLAG_SECDED | EDAC_FLAG_S4ECD4ED; 384 EDAC_FLAG_NONE | EDAC_FLAG_SECDED | EDAC_FLAG_S4ECD4ED;
385 /* FIXME - what if different memory types are in different csrows? */ 385 /* FIXME - what if different memory types are in different csrows? */
386 mci->mod_name = BS_MOD_STR; 386 mci->mod_name = EDAC_MOD_STR;
387 mci->mod_ver = "$Revision: 1.5.2.9 $"; 387 mci->mod_ver = "$Revision: 1.5.2.9 $";
388 mci->pdev = pdev; 388 mci->pdev = pdev;
389 389
@@ -536,7 +536,7 @@ MODULE_DEVICE_TABLE(pci, e7xxx_pci_tbl);
536 536
537 537
538static struct pci_driver e7xxx_driver = { 538static struct pci_driver e7xxx_driver = {
539 .name = BS_MOD_STR, 539 .name = EDAC_MOD_STR,
540 .probe = e7xxx_init_one, 540 .probe = e7xxx_init_one,
541 .remove = __devexit_p(e7xxx_remove_one), 541 .remove = __devexit_p(e7xxx_remove_one),
542 .id_table = e7xxx_pci_tbl, 542 .id_table = e7xxx_pci_tbl,
diff --git a/drivers/edac/edac_mc.h b/drivers/edac/edac_mc.h
index 4bd8375a8d7e..0bcc3797c753 100644
--- a/drivers/edac/edac_mc.h
+++ b/drivers/edac/edac_mc.h
@@ -80,9 +80,9 @@ extern int edac_debug_level;
80#endif /* !CONFIG_EDAC_DEBUG */ 80#endif /* !CONFIG_EDAC_DEBUG */
81 81
82 82
83#define bs_xstr(s) bs_str(s) 83#define edac_xstr(s) edac_str(s)
84#define bs_str(s) #s 84#define edac_str(s) #s
85#define BS_MOD_STR bs_xstr(KBUILD_BASENAME) 85#define EDAC_MOD_STR edac_xstr(KBUILD_BASENAME)
86 86
87#define BIT(x) (1 << (x)) 87#define BIT(x) (1 << (x))
88 88
diff --git a/drivers/edac/i82860_edac.c b/drivers/edac/i82860_edac.c
index fa9ab84fa5c9..b0c05ad73067 100644
--- a/drivers/edac/i82860_edac.c
+++ b/drivers/edac/i82860_edac.c
@@ -162,7 +162,7 @@ static int i82860_probe1(struct pci_dev *pdev, int dev_idx)
162 mci->edac_cap = EDAC_FLAG_SECDED; 162 mci->edac_cap = EDAC_FLAG_SECDED;
163 /* adjust FLAGS */ 163 /* adjust FLAGS */
164 164
165 mci->mod_name = BS_MOD_STR; 165 mci->mod_name = EDAC_MOD_STR;
166 mci->mod_ver = "$Revision: 1.1.2.6 $"; 166 mci->mod_ver = "$Revision: 1.1.2.6 $";
167 mci->ctl_name = i82860_devs[dev_idx].ctl_name; 167 mci->ctl_name = i82860_devs[dev_idx].ctl_name;
168 mci->edac_check = i82860_check; 168 mci->edac_check = i82860_check;
@@ -253,7 +253,7 @@ static const struct pci_device_id i82860_pci_tbl[] __devinitdata = {
253MODULE_DEVICE_TABLE(pci, i82860_pci_tbl); 253MODULE_DEVICE_TABLE(pci, i82860_pci_tbl);
254 254
255static struct pci_driver i82860_driver = { 255static struct pci_driver i82860_driver = {
256 .name = BS_MOD_STR, 256 .name = EDAC_MOD_STR,
257 .probe = i82860_init_one, 257 .probe = i82860_init_one,
258 .remove = __devexit_p(i82860_remove_one), 258 .remove = __devexit_p(i82860_remove_one),
259 .id_table = i82860_pci_tbl, 259 .id_table = i82860_pci_tbl,
diff --git a/drivers/edac/i82875p_edac.c b/drivers/edac/i82875p_edac.c
index 0e22c66ee36c..a547c30473e4 100644
--- a/drivers/edac/i82875p_edac.c
+++ b/drivers/edac/i82875p_edac.c
@@ -357,7 +357,7 @@ static int i82875p_probe1(struct pci_dev *pdev, int dev_idx)
357 mci->edac_cap = EDAC_FLAG_UNKNOWN; 357 mci->edac_cap = EDAC_FLAG_UNKNOWN;
358 /* adjust FLAGS */ 358 /* adjust FLAGS */
359 359
360 mci->mod_name = BS_MOD_STR; 360 mci->mod_name = EDAC_MOD_STR;
361 mci->mod_ver = "$Revision: 1.5.2.11 $"; 361 mci->mod_ver = "$Revision: 1.5.2.11 $";
362 mci->ctl_name = i82875p_devs[dev_idx].ctl_name; 362 mci->ctl_name = i82875p_devs[dev_idx].ctl_name;
363 mci->edac_check = i82875p_check; 363 mci->edac_check = i82875p_check;
@@ -483,7 +483,7 @@ MODULE_DEVICE_TABLE(pci, i82875p_pci_tbl);
483 483
484 484
485static struct pci_driver i82875p_driver = { 485static struct pci_driver i82875p_driver = {
486 .name = BS_MOD_STR, 486 .name = EDAC_MOD_STR,
487 .probe = i82875p_init_one, 487 .probe = i82875p_init_one,
488 .remove = __devexit_p(i82875p_remove_one), 488 .remove = __devexit_p(i82875p_remove_one),
489 .id_table = i82875p_pci_tbl, 489 .id_table = i82875p_pci_tbl,
diff --git a/drivers/edac/r82600_edac.c b/drivers/edac/r82600_edac.c
index 27d16dc2f11d..ac1359828e78 100644
--- a/drivers/edac/r82600_edac.c
+++ b/drivers/edac/r82600_edac.c
@@ -265,7 +265,7 @@ static int r82600_probe1(struct pci_dev *pdev, int dev_idx)
265 } else 265 } else
266 mci->edac_cap = EDAC_FLAG_NONE; 266 mci->edac_cap = EDAC_FLAG_NONE;
267 267
268 mci->mod_name = BS_MOD_STR; 268 mci->mod_name = EDAC_MOD_STR;
269 mci->mod_ver = "$Revision: 1.1.2.6 $"; 269 mci->mod_ver = "$Revision: 1.1.2.6 $";
270 mci->ctl_name = "R82600"; 270 mci->ctl_name = "R82600";
271 mci->edac_check = r82600_check; 271 mci->edac_check = r82600_check;
@@ -376,7 +376,7 @@ MODULE_DEVICE_TABLE(pci, r82600_pci_tbl);
376 376
377 377
378static struct pci_driver r82600_driver = { 378static struct pci_driver r82600_driver = {
379 .name = BS_MOD_STR, 379 .name = EDAC_MOD_STR,
380 .probe = r82600_init_one, 380 .probe = r82600_init_one,
381 .remove = __devexit_p(r82600_remove_one), 381 .remove = __devexit_p(r82600_remove_one),
382 .id_table = r82600_pci_tbl, 382 .id_table = r82600_pci_tbl,