summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJiri Kosina2012-05-22 10:56:21 +0200
committerJiri Kosina2012-05-22 11:00:09 +0200
commitf70d4a95edc7da87f39cd8b603ba131df2c198ed (patch)
tree2ce19fca965fa44e2c6737edee1851f1d16602e1
parentxtensa: Change mail addresses of Hannes Weiner and Oskar Schirmer (diff)
downloadkernel-qcow2-linux-f70d4a95edc7da87f39cd8b603ba131df2c198ed.tar.gz
kernel-qcow2-linux-f70d4a95edc7da87f39cd8b603ba131df2c198ed.tar.xz
kernel-qcow2-linux-f70d4a95edc7da87f39cd8b603ba131df2c198ed.zip
edac, mips: don't change code that has been removed in edac/mips tree
This is a partial revert of 15ed103a9800 ("edac: Fix spelling errors") 6997991ab0db ("mips: Fix printk typos in arc/mips") which change code that doesn't exist any more in edac/mips trees. Reported-by: Stephen Rothwell <sfr@canb.auug.org.au> Signed-off-by: Jiri Kosina <jkosina@suse.cz>
-rw-r--r--arch/mips/pci/pci-lantiq.c2
-rw-r--r--drivers/edac/edac_core.h2
-rw-r--r--drivers/edac/edac_device.c2
3 files changed, 3 insertions, 3 deletions
diff --git a/arch/mips/pci/pci-lantiq.c b/arch/mips/pci/pci-lantiq.c
index 70fdf2c7919b..030c77e7926e 100644
--- a/arch/mips/pci/pci-lantiq.c
+++ b/arch/mips/pci/pci-lantiq.c
@@ -297,7 +297,7 @@ int __init pcibios_init(void)
{
int ret = platform_driver_register(&ltq_pci_driver);
if (ret)
- printk(KERN_INFO "ltq_pci: Error registering platform driver!");
+ printk(KERN_INFO "ltq_pci: Error registering platfom driver!");
return ret;
}
diff --git a/drivers/edac/edac_core.h b/drivers/edac/edac_core.h
index 841bb2d7ce61..5b739411d62f 100644
--- a/drivers/edac/edac_core.h
+++ b/drivers/edac/edac_core.h
@@ -460,7 +460,7 @@ extern int edac_mc_find_csrow_by_page(struct mem_ctl_info *mci,
/*
* The no info errors are used when error overflows are reported.
* There are a limited number of error logging registers that can
- * be exhausted. When all registers are exhausted and an additional
+ * be exausted. When all registers are exhausted and an additional
* error occurs then an error overflow register records that an
* error occurred and the type of error, but doesn't have any
* further information. The ce/ue versions make for cleaner
diff --git a/drivers/edac/edac_device.c b/drivers/edac/edac_device.c
index da4a1f11939f..45b8f4bdd773 100644
--- a/drivers/edac/edac_device.c
+++ b/drivers/edac/edac_device.c
@@ -367,7 +367,7 @@ static void del_edac_device_from_global_list(struct edac_device_ctl_info
* structure, that needs to be polled for possible error events.
*
* This operation is to acquire the list mutex lock
- * (thus preventing insertion or deletion)
+ * (thus preventing insertation or deletion)
* and then call the device's poll function IFF this device is
* running polled and there is a poll function defined.
*/