diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-04-10 17:21:57 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-04-10 17:21:57 -0700 |
| commit | b4dfd6bc35f6c1e0fcbb4268c523b3939955d3af (patch) | |
| tree | 2b33ae37af2c77fd844243165d00a47450cfc543 /arch/ia64/kernel/setup.c | |
| parent | 90f30eccf41302a2542f5d374af243061902bd98 (diff) | |
| parent | 2e0d232bff31973f58c33412b45fce51b6770698 (diff) | |
| download | blackbird-op-linux-b4dfd6bc35f6c1e0fcbb4268c523b3939955d3af.tar.gz blackbird-op-linux-b4dfd6bc35f6c1e0fcbb4268c523b3939955d3af.zip | |
Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6
* 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6:
[IA64] SGI Altix : fix pcibr_dmamap_ate32() bug
[IA64] Fix CPU freq displayed in /proc/cpuinfo
[IA64] Fix wrong assumption about irq and vector in msi_ia64.c
[IA64] BTE error timer fix
Diffstat (limited to 'arch/ia64/kernel/setup.c')
| -rw-r--r-- | arch/ia64/kernel/setup.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/ia64/kernel/setup.c b/arch/ia64/kernel/setup.c index 69b9bb3fd7c5..dc7dd7648ec5 100644 --- a/arch/ia64/kernel/setup.c +++ b/arch/ia64/kernel/setup.c @@ -640,7 +640,7 @@ show_cpuinfo (struct seq_file *m, void *v) "features : %s\n" "cpu number : %lu\n" "cpu regs : %u\n" - "cpu MHz : %lu.%06lu\n" + "cpu MHz : %lu.%03lu\n" "itc MHz : %lu.%06lu\n" "BogoMIPS : %lu.%02lu\n", cpunum, c->vendor, c->family, c->model, |
