diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 1997-12-06 23:51:34 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 1997-12-06 23:51:34 +0000 |
| commit | 230e5ab6a084ed50470f101934782dbf54b0d06b (patch) | |
| tree | 5dd821c8d33f450470588e7a543f74bf74306e9e /drivers/net/ariadne.c | |
| parent | c9b1c8a64c6444d189856f1e26bdcb8b4cd0113a (diff) | |
Merge with Linux 2.1.67.
Diffstat (limited to 'drivers/net/ariadne.c')
| -rw-r--r-- | drivers/net/ariadne.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/drivers/net/ariadne.c b/drivers/net/ariadne.c index 884398c53..667bd75fc 100644 --- a/drivers/net/ariadne.c +++ b/drivers/net/ariadne.c @@ -6,7 +6,7 @@ * Peter De Schrijver * (Peter.DeSchrijver@linux.cc.kuleuven.ac.be) * - * ---------------------------------------------------------------------------------- + * --------------------------------------------------------------------------- * * This program is based on * @@ -20,13 +20,13 @@ * MC68230: Parallel Interface/Timer (PI/T) * Motorola Semiconductors, December, 1983 * - * ---------------------------------------------------------------------------------- + * --------------------------------------------------------------------------- * * This file is subject to the terms and conditions of the GNU General Public * License. See the file COPYING in the main directory of the Linux * distribution for more details. * - * ---------------------------------------------------------------------------------- + * --------------------------------------------------------------------------- * * The Ariadne is a Zorro-II board made by Village Tronic. It contains: * @@ -107,7 +107,7 @@ struct ariadne_private { struct net_device_stats stats; char tx_full; unsigned long lock; - int key; + unsigned int key; }; @@ -148,13 +148,13 @@ static void memcpyw(u_short *dest, u_short *src, int len) __initfunc(int ariadne_probe(struct device *dev)) { - int key; - struct ConfigDev *cd; + unsigned int key; + const struct ConfigDev *cd; u_long board; struct ariadne_private *priv; /* Ethernet is part 0, Parallel is part 1 */ - if ((key = zorro_find(MANUF_VILLAGE_TRONIC, PROD_ARIADNE, 0, 0))) { + if ((key = zorro_find(ZORRO_PROD_VILLAGE_TRONIC_ARIADNE, 0, 0))) { cd = zorro_get_board(key); if ((board = (u_long)cd->cd_BoardAddr)) { dev->dev_addr[0] = 0x00; |