From 3ed8a4a831ae0b346a72cef887485df77e5e226e Mon Sep 17 00:00:00 2001 From: Dmitri Vorobiev Date: Mon, 23 Mar 2009 00:12:27 +0200 Subject: [PATCH] --- yaml --- r: 138610 b: refs/heads/master c: d0cdfe2423e30f552eb3c90f20fb4c36bb548650 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/arch/mips/include/asm/mips-boards/generic.h | 2 -- trunk/arch/mips/mti-malta/malta-init.c | 2 +- 3 files changed, 2 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 7023ed240201..e2940293f6bc 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: b72b7092f8f5f0729cc9f0868997351f21dbc5cd +refs/heads/master: d0cdfe2423e30f552eb3c90f20fb4c36bb548650 diff --git a/trunk/arch/mips/include/asm/mips-boards/generic.h b/trunk/arch/mips/include/asm/mips-boards/generic.h index 7f0b034dd9a5..c0da1a881e3d 100644 --- a/trunk/arch/mips/include/asm/mips-boards/generic.h +++ b/trunk/arch/mips/include/asm/mips-boards/generic.h @@ -71,8 +71,6 @@ #define MIPS_REVISION_CORID (((*(volatile u32 *)ioremap(MIPS_REVISION_REG, 4)) >> 10) & 0x3f) -extern int mips_revision_corid; - #define MIPS_REVISION_SCON_OTHER 0 #define MIPS_REVISION_SCON_SOCITSC 1 #define MIPS_REVISION_SCON_SOCITSCP 2 diff --git a/trunk/arch/mips/mti-malta/malta-init.c b/trunk/arch/mips/mti-malta/malta-init.c index 4832af251668..475038a141a6 100644 --- a/trunk/arch/mips/mti-malta/malta-init.c +++ b/trunk/arch/mips/mti-malta/malta-init.c @@ -48,7 +48,7 @@ int *_prom_argv, *_prom_envp; int init_debug = 0; -int mips_revision_corid; +static int mips_revision_corid; int mips_revision_sconid; /* Bonito64 system controller register base. */