Merge branch 'sh/stable-updates'

This commit is contained in:
Paul Mundt
2009-10-14 15:53:08 +09:00
4 changed files with 9 additions and 6 deletions

View File

@@ -553,6 +553,8 @@ static int show_cpuinfo(struct seq_file *m, void *v)
if (cpu == 0)
seq_printf(m, "machine\t\t: %s\n", get_system_type());
else
seq_printf(m, "\n");
seq_printf(m, "processor\t: %d\n", cpu);
seq_printf(m, "cpu family\t: %s\n", init_utsname()->machine);