diff options
Diffstat (limited to 'arch/sparc')
-rw-r--r-- | arch/sparc/include/asm/fbio.h | 2 | ||||
-rw-r--r-- | arch/sparc/kernel/perf_event.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/arch/sparc/include/asm/fbio.h b/arch/sparc/include/asm/fbio.h index b9215a0907d3..0a21da87f7d6 100644 --- a/arch/sparc/include/asm/fbio.h +++ b/arch/sparc/include/asm/fbio.h | |||
@@ -173,7 +173,7 @@ struct mdi_cfginfo { | |||
173 | int mdi_ncluts; /* Number of implemented CLUTs in this MDI */ | 173 | int mdi_ncluts; /* Number of implemented CLUTs in this MDI */ |
174 | int mdi_type; /* FBTYPE name */ | 174 | int mdi_type; /* FBTYPE name */ |
175 | int mdi_height; /* height */ | 175 | int mdi_height; /* height */ |
176 | int mdi_width; /* widht */ | 176 | int mdi_width; /* width */ |
177 | int mdi_size; /* available ram */ | 177 | int mdi_size; /* available ram */ |
178 | int mdi_mode; /* 8bpp, 16bpp or 32bpp */ | 178 | int mdi_mode; /* 8bpp, 16bpp or 32bpp */ |
179 | int mdi_pixfreq; /* pixel clock (from PROM) */ | 179 | int mdi_pixfreq; /* pixel clock (from PROM) */ |
diff --git a/arch/sparc/kernel/perf_event.c b/arch/sparc/kernel/perf_event.c index 9f2b2bac8b2b..b867ab3353b4 100644 --- a/arch/sparc/kernel/perf_event.c +++ b/arch/sparc/kernel/perf_event.c | |||
@@ -1353,7 +1353,7 @@ static void perf_callchain_user_32(struct pt_regs *regs, | |||
1353 | } | 1353 | } |
1354 | 1354 | ||
1355 | /* Like powerpc we can't get PMU interrupts within the PMU handler, | 1355 | /* Like powerpc we can't get PMU interrupts within the PMU handler, |
1356 | * so no need for seperate NMI and IRQ chains as on x86. | 1356 | * so no need for separate NMI and IRQ chains as on x86. |
1357 | */ | 1357 | */ |
1358 | static DEFINE_PER_CPU(struct perf_callchain_entry, callchain); | 1358 | static DEFINE_PER_CPU(struct perf_callchain_entry, callchain); |
1359 | 1359 | ||