diff options
author | Jody McIntyre <scjody@modernduck.com> | 2006-03-28 20:24:39 -0500 |
---|---|---|
committer | Jody McIntyre <scjody@modernduck.com> | 2006-03-28 20:24:39 -0500 |
commit | c0e4077c946104e5d8a62f835dcdca5c79c8af7d (patch) | |
tree | c1f458722f86690a6172bbac2dfef3241ba0ec7e /drivers/edac/edac_mc.c | |
parent | 94c2d01a537daf51a9fcf229d7d2204c979355d9 (diff) | |
parent | ca9ba4471c1203bb6e759b76e83167fec54fe590 (diff) |
Merge with git+ssh://master.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git
Diffstat (limited to 'drivers/edac/edac_mc.c')
-rw-r--r-- | drivers/edac/edac_mc.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/edac/edac_mc.c b/drivers/edac/edac_mc.c index 905f58ba8e16..ea06e3a4dc35 100644 --- a/drivers/edac/edac_mc.c +++ b/drivers/edac/edac_mc.c | |||
@@ -2044,7 +2044,7 @@ static int __init edac_mc_init(void) | |||
2044 | */ | 2044 | */ |
2045 | clear_pci_parity_errors(); | 2045 | clear_pci_parity_errors(); |
2046 | 2046 | ||
2047 | /* Create the MC sysfs entires */ | 2047 | /* Create the MC sysfs entries */ |
2048 | if (edac_sysfs_memctrl_setup()) { | 2048 | if (edac_sysfs_memctrl_setup()) { |
2049 | edac_printk(KERN_ERR, EDAC_MC, | 2049 | edac_printk(KERN_ERR, EDAC_MC, |
2050 | "Error initializing sysfs code\n"); | 2050 | "Error initializing sysfs code\n"); |