summaryrefslogtreecommitdiffstats
path: root/arch/mips/sgi/kernel/indy_hpc.c
diff options
context:
space:
mode:
authorRalf Baechle <ralf@linux-mips.org>1999-12-04 03:58:56 +0000
committerRalf Baechle <ralf@linux-mips.org>1999-12-04 03:58:56 +0000
commit1d67e90f19a7acfd9a05dc59678e7d0c5090bd0d (patch)
tree357efc7b93f8f5102110d20d293f41360ec212fc /arch/mips/sgi/kernel/indy_hpc.c
parentaea27b2e18d69af87e673972246e66657b4fa274 (diff)
Merge with Linux 2.3.21.
Diffstat (limited to 'arch/mips/sgi/kernel/indy_hpc.c')
-rw-r--r--arch/mips/sgi/kernel/indy_hpc.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/mips/sgi/kernel/indy_hpc.c b/arch/mips/sgi/kernel/indy_hpc.c
index 5a2663716..4a40825ff 100644
--- a/arch/mips/sgi/kernel/indy_hpc.c
+++ b/arch/mips/sgi/kernel/indy_hpc.c
@@ -1,4 +1,4 @@
-/* $Id: indy_hpc.c,v 1.7 1999/10/09 00:00:59 ralf Exp $
+/* $Id: indy_hpc.c,v 1.8 1999/10/21 00:23:05 ralf Exp $
*
* indy_hpc.c: Routines for generic manipulation of the HPC controllers.
*
@@ -18,7 +18,7 @@ struct hpc3_regs *hpc3c0, *hpc3c1;
struct hpc3_miscregs *hpc3mregs;
/* We need software copies of these because they are write only. */
-unsigned long sgi_hpc_write1, sgi_hpc_write2;
+unsigned int sgi_hpc_write1, sgi_hpc_write2;
/* Machine specific identifier knobs. */
int sgi_has_ioc2 = 0;