diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-02-28 10:36:48 -0800 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-02-28 10:36:48 -0800 |
commit | 43a834d86c136b31ef6ad796725eb474a55a908d (patch) | |
tree | 973db568aa41089f8d160982a850bec32c801c72 /arch/x86/kernel/uv_sysfs.c | |
parent | a7f16d10b510f9ee3500af7831f2e3094fab3dca (diff) | |
parent | 3235dc3f22378f35ce77eba0d0f62db2d9c4844e (diff) | |
download | op-kernel-dev-43a834d86c136b31ef6ad796725eb474a55a908d.zip op-kernel-dev-43a834d86c136b31ef6ad796725eb474a55a908d.tar.gz |
Merge branch 'x86-cleanups-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
* 'x86-cleanups-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
x86: Remove trailing spaces in messages
x86, mtrr: Remove unused mtrr/state.c
x86, trivial: Fix grammo in tsc comment about Geode TSC reliability
Diffstat (limited to 'arch/x86/kernel/uv_sysfs.c')
-rw-r--r-- | arch/x86/kernel/uv_sysfs.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/x86/kernel/uv_sysfs.c b/arch/x86/kernel/uv_sysfs.c index 36afb98..309c70f 100644 --- a/arch/x86/kernel/uv_sysfs.c +++ b/arch/x86/kernel/uv_sysfs.c @@ -54,19 +54,19 @@ static int __init sgi_uv_sysfs_init(void) if (!sgi_uv_kobj) sgi_uv_kobj = kobject_create_and_add("sgi_uv", firmware_kobj); if (!sgi_uv_kobj) { - printk(KERN_WARNING "kobject_create_and_add sgi_uv failed \n"); + printk(KERN_WARNING "kobject_create_and_add sgi_uv failed\n"); return -EINVAL; } ret = sysfs_create_file(sgi_uv_kobj, &partition_id_attr.attr); if (ret) { - printk(KERN_WARNING "sysfs_create_file partition_id failed \n"); + printk(KERN_WARNING "sysfs_create_file partition_id failed\n"); return ret; } ret = sysfs_create_file(sgi_uv_kobj, &coherence_id_attr.attr); if (ret) { - printk(KERN_WARNING "sysfs_create_file coherence_id failed \n"); + printk(KERN_WARNING "sysfs_create_file coherence_id failed\n"); return ret; } |