Merge commit 'v2.6.29' into core/header-fixes

1 files changed, 2 insertions, 0 deletions

diff --git a/arch/sparc/kernel/setup_64.c b/arch/sparc/kernel/setup_64.c
index 49d061f4ae9d..f2bcfd2967d7 100644
--- a/arch/sparc/kernel/setup_64.c
+++ b/arch/sparc/kernel/setup_64.c
@@ -354,6 +354,7 @@ static int show_cpuinfo(struct seq_file *m, void *__unused)
         seq_printf(m, 
                    "cpu\t\t: %s\n"
                    "fpu\t\t: %s\n"
+                   "pmu\t\t: %s\n"
                    "prom\t\t: %s\n"
                    "type\t\t: %s\n"
                    "ncpus probed\t: %d\n"
@@ -366,6 +367,7 @@ static int show_cpuinfo(struct seq_file *m, void *__unused)
                    ,
                    sparc_cpu_type,
                    sparc_fpu_type,
+                   sparc_pmu_type,
                    prom_version,
                    ((tlb_type == hypervisor) ?
                     "sun4v" :