diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2008-03-04 20:20:32 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2008-03-04 20:20:32 -0800 |
| commit | 665c1ef8369138dad7773da6407fe77ccff87deb (patch) | |
| tree | 35ea30dcd0e1bbdfc0a9ceab99322eaad28e02e4 /arch/sparc64/kernel/cpu.c | |
| parent | 71ca44dac4cbf89ce88e460a293cc25c5b18fa50 (diff) | |
| parent | f0e98c387e61de00646be31fab4c2fa0224e1efb (diff) | |
| download | kernel_samsung_crespo-665c1ef8369138dad7773da6407fe77ccff87deb.zip kernel_samsung_crespo-665c1ef8369138dad7773da6407fe77ccff87deb.tar.gz kernel_samsung_crespo-665c1ef8369138dad7773da6407fe77ccff87deb.tar.bz2 | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6:
[SPARC]: Fix link errors with gcc-4.3
sparc64: replace remaining __FUNCTION__ occurances
sparc: replace remaining __FUNCTION__ occurances
[SPARC]: Add reboot_command[] extern decl to asm/system.h
[SPARC]: Mark linux_sparc_{fpu,chips} static.
Diffstat (limited to 'arch/sparc64/kernel/cpu.c')
| -rw-r--r-- | arch/sparc64/kernel/cpu.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/sparc64/kernel/cpu.c b/arch/sparc64/kernel/cpu.c index e43db73..dd5d28e 100644 --- a/arch/sparc64/kernel/cpu.c +++ b/arch/sparc64/kernel/cpu.c @@ -30,7 +30,7 @@ struct cpu_fp_info { char* fp_name; }; -struct cpu_fp_info linux_sparc_fpu[] = { +static struct cpu_fp_info linux_sparc_fpu[] = { { 0x17, 0x10, 0, "UltraSparc I integrated FPU"}, { 0x22, 0x10, 0, "UltraSparc I integrated FPU"}, { 0x17, 0x11, 0, "UltraSparc II integrated FPU"}, @@ -46,7 +46,7 @@ struct cpu_fp_info linux_sparc_fpu[] = { #define NSPARCFPU ARRAY_SIZE(linux_sparc_fpu) -struct cpu_iu_info linux_sparc_chips[] = { +static struct cpu_iu_info linux_sparc_chips[] = { { 0x17, 0x10, "TI UltraSparc I (SpitFire)"}, { 0x22, 0x10, "TI UltraSparc I (SpitFire)"}, { 0x17, 0x11, "TI UltraSparc II (BlackBird)"}, |