summaryrefslogtreecommitdiffstats
path: root/arch/i386/kernel/cpu/proc.c
diff options
context:
space:
mode:
authorJeff Garzik <jgarzik@pretzel.yyz.us>2005-06-27 05:42:30 +0200
committerJeff Garzik <jgarzik@pobox.com>2005-06-27 05:42:30 +0200
commitf45727d52d1581e9ff4df9d1a12a60789ad2d1eb (patch)
tree773ae25f98542e6d382c688f7e85e8137d065614 /arch/i386/kernel/cpu/proc.c
parentAutomatic merge of /spare/repo/netdev-2.6 branch we18-ieee80211 (diff)
parentMerge /spare/repo/linux-2.6/ (diff)
downloadlinux-f45727d52d1581e9ff4df9d1a12a60789ad2d1eb.tar.xz
linux-f45727d52d1581e9ff4df9d1a12a60789ad2d1eb.zip
Merge /spare/repo/netdev-2.6/ branch 'ieee80211'
Diffstat (limited to 'arch/i386/kernel/cpu/proc.c')
-rw-r--r--arch/i386/kernel/cpu/proc.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/i386/kernel/cpu/proc.c b/arch/i386/kernel/cpu/proc.c
index 7323c19f354e..8bd77d948a84 100644
--- a/arch/i386/kernel/cpu/proc.c
+++ b/arch/i386/kernel/cpu/proc.c
@@ -86,7 +86,7 @@ static int show_cpuinfo(struct seq_file *m, void *v)
seq_printf(m, "stepping\t: unknown\n");
if ( cpu_has(c, X86_FEATURE_TSC) ) {
- seq_printf(m, "cpu MHz\t\t: %lu.%03lu\n",
+ seq_printf(m, "cpu MHz\t\t: %u.%03u\n",
cpu_khz / 1000, (cpu_khz % 1000));
}