diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 1999-12-04 03:58:56 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 1999-12-04 03:58:56 +0000 |
| commit | 1d67e90f19a7acfd9a05dc59678e7d0c5090bd0d (patch) | |
| tree | 357efc7b93f8f5102110d20d293f41360ec212fc /drivers/net/sgiseeq.h | |
| parent | aea27b2e18d69af87e673972246e66657b4fa274 (diff) | |
Merge with Linux 2.3.21.
Diffstat (limited to 'drivers/net/sgiseeq.h')
| -rw-r--r-- | drivers/net/sgiseeq.h | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/drivers/net/sgiseeq.h b/drivers/net/sgiseeq.h index 4f684f5a1..0b5d39c68 100644 --- a/drivers/net/sgiseeq.h +++ b/drivers/net/sgiseeq.h @@ -1,4 +1,4 @@ -/* $Id: sgiseeq.h,v 1.1 1997/06/09 08:34:32 ralf Exp $ +/* $Id: sgiseeq.h,v 1.4 1999/10/09 00:01:24 ralf Exp $ * sgiseeq.h: Defines for the Seeq8003 ethernet controller. * * Copyright (C) 1996 David S. Miller (dm@engr.sgi.com) @@ -7,27 +7,27 @@ #define _SGISEEQ_H struct sgiseeq_wregs { - volatile unsigned long multicase_high[2]; - volatile unsigned long frame_gap; - volatile unsigned long control; + volatile unsigned int multicase_high[2]; + volatile unsigned int frame_gap; + volatile unsigned int control; }; struct sgiseeq_rregs { - volatile unsigned long collision_tx[2]; - volatile unsigned long collision_all[2]; - volatile unsigned long _unused0; - volatile unsigned long rflags; + volatile unsigned int collision_tx[2]; + volatile unsigned int collision_all[2]; + volatile unsigned int _unused0; + volatile unsigned int rflags; }; struct sgiseeq_regs { union { - volatile unsigned long eth_addr[6]; - volatile unsigned long multicast_low[6]; + volatile unsigned int eth_addr[6]; + volatile unsigned int multicast_low[6]; struct sgiseeq_wregs wregs; struct sgiseeq_rregs rregs; } rw; - volatile unsigned long rstat; - volatile unsigned long tstat; + volatile unsigned int rstat; + volatile unsigned int tstat; }; /* Seeq8003 receive status register */ |