summaryrefslogtreecommitdiff
path: root/arch/mips/sgi-ip22/ip22-platform.c
diff options
context:
space:
mode:
authorKumar Gala <galak@kernel.crashing.org>2011-05-19 09:36:21 +0400
committerKumar Gala <galak@kernel.crashing.org>2011-05-19 09:36:21 +0400
commit134c428e5a31f2d5ed3a70ba20dac83895ec8b82 (patch)
tree0fb28accbf09171b8a1ca792361f4160434529e8 /arch/mips/sgi-ip22/ip22-platform.c
parenta0496d450ab8c17f6c4d86979b1f6ba486fe9365 (diff)
parentc560bbceaf6b06e52f1ef20131b76a3fdc0a2c19 (diff)
downloadlinux-134c428e5a31f2d5ed3a70ba20dac83895ec8b82.tar.xz
Merge remote branch 'benh/merge' into benh-next
Diffstat (limited to 'arch/mips/sgi-ip22/ip22-platform.c')
-rw-r--r--arch/mips/sgi-ip22/ip22-platform.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/mips/sgi-ip22/ip22-platform.c b/arch/mips/sgi-ip22/ip22-platform.c
index deddbf0ebe5c..698904daf901 100644
--- a/arch/mips/sgi-ip22/ip22-platform.c
+++ b/arch/mips/sgi-ip22/ip22-platform.c
@@ -132,7 +132,7 @@ static struct platform_device eth1_device = {
*/
static int __init sgiseeq_devinit(void)
{
- unsigned int tmp;
+ unsigned int pbdma __maybe_unused;
int res, i;
eth0_pd.hpc = hpc3c0;
@@ -151,7 +151,7 @@ static int __init sgiseeq_devinit(void)
/* Second HPC is missing? */
if (ip22_is_fullhouse() ||
- get_dbe(tmp, (unsigned int *)&hpc3c1->pbdma[1]))
+ get_dbe(pbdma, (unsigned int *)&hpc3c1->pbdma[1]))
return 0;
sgimc->giopar |= SGIMC_GIOPAR_MASTEREXP1 | SGIMC_GIOPAR_EXP164 |