Manual merge with Linus.

[linux-2.6-microblaze.git] / drivers / edac / edac_mc.c

diff --git a/drivers/edac/edac_mc.c b/drivers/edac/edac_mc.c
index 905f58b..ea06e3a 100644 (file)
--- a/drivers/edac/edac_mc.c
+++ b/drivers/edac/edac_mc.c
@@ -2044,7 +2044,7 @@ static int __init edac_mc_init(void)
         */
        clear_pci_parity_errors();
 
-       /* Create the MC sysfs entires */
+       /* Create the MC sysfs entries */
        if (edac_sysfs_memctrl_setup()) {
                edac_printk(KERN_ERR, EDAC_MC,
                        "Error initializing sysfs code\n");