diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-02-13 03:44:22 -0500 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-02-13 03:44:22 -0500 |
| commit | f8a6b2b9cee298a9663cbe38ce1eb5240987cb62 (patch) | |
| tree | b356490269c9e77d164dcc1477792b882fbb8bdb /arch/sparc/kernel/kernel.h | |
| parent | ba1511bf7fbda452138e4096bf10d5a382710f4f (diff) | |
| parent | 071a0bc2ceace31266836801510879407a3701fa (diff) | |
Merge branch 'linus' into x86/apic
Conflicts:
arch/x86/kernel/acpi/boot.c
arch/x86/mm/fault.c
Diffstat (limited to 'arch/sparc/kernel/kernel.h')
| -rw-r--r-- | arch/sparc/kernel/kernel.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/sparc/kernel/kernel.h b/arch/sparc/kernel/kernel.h index 81a972e8d8ea..15d8a3f645c9 100644 --- a/arch/sparc/kernel/kernel.h +++ b/arch/sparc/kernel/kernel.h | |||
| @@ -5,6 +5,7 @@ | |||
| 5 | 5 | ||
| 6 | /* cpu.c */ | 6 | /* cpu.c */ |
| 7 | extern const char *sparc_cpu_type; | 7 | extern const char *sparc_cpu_type; |
| 8 | extern const char *sparc_pmu_type; | ||
| 8 | extern const char *sparc_fpu_type; | 9 | extern const char *sparc_fpu_type; |
| 9 | 10 | ||
| 10 | extern unsigned int fsr_storage; | 11 | extern unsigned int fsr_storage; |