From 3e5412d0135479bc6f2049ec0df817bd6f286ed4 Mon Sep 17 00:00:00 2001 From: Jiri Kosina Date: Tue, 22 May 2012 10:56:21 +0200 Subject: [PATCH] --- yaml --- r: 305136 b: refs/heads/master c: f70d4a95edc7da87f39cd8b603ba131df2c198ed h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/arch/mips/pci/pci-lantiq.c | 2 +- trunk/drivers/edac/edac_core.h | 2 +- trunk/drivers/edac/edac_device.c | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index a28a017ee311..96bc967f6100 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: a45170e7ad65b2b7179c7bbe8780882159c829fb +refs/heads/master: f70d4a95edc7da87f39cd8b603ba131df2c198ed diff --git a/trunk/arch/mips/pci/pci-lantiq.c b/trunk/arch/mips/pci/pci-lantiq.c index 70fdf2c7919b..030c77e7926e 100644 --- a/trunk/arch/mips/pci/pci-lantiq.c +++ b/trunk/arch/mips/pci/pci-lantiq.c @@ -297,7 +297,7 @@ int __init pcibios_init(void) { int ret = platform_driver_register(<q_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/trunk/drivers/edac/edac_core.h b/trunk/drivers/edac/edac_core.h index 841bb2d7ce61..5b739411d62f 100644 --- a/trunk/drivers/edac/edac_core.h +++ b/trunk/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/trunk/drivers/edac/edac_device.c b/trunk/drivers/edac/edac_device.c index da4a1f11939f..45b8f4bdd773 100644 --- a/trunk/drivers/edac/edac_device.c +++ b/trunk/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. */