aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/smc-ultra.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/net/smc-ultra.c')
-rw-r--r--drivers/net/smc-ultra.c7
1 files changed, 3 insertions, 4 deletions
diff --git a/drivers/net/smc-ultra.c b/drivers/net/smc-ultra.c
index 5b4e8529d4ab..7986514883ac 100644
--- a/drivers/net/smc-ultra.c
+++ b/drivers/net/smc-ultra.c
@@ -57,7 +57,6 @@
57static const char version[] = 57static const char version[] =
58 "smc-ultra.c:v2.02 2/3/98 Donald Becker (becker@cesdis.gsfc.nasa.gov)\n"; 58 "smc-ultra.c:v2.02 2/3/98 Donald Becker (becker@cesdis.gsfc.nasa.gov)\n";
59 59
60#include <linux/config.h>
61#include <linux/module.h> 60#include <linux/module.h>
62#include <linux/kernel.h> 61#include <linux/kernel.h>
63#include <linux/errno.h> 62#include <linux/errno.h>
@@ -112,7 +111,7 @@ static struct isapnp_device_id ultra_device_ids[] __initdata = {
112MODULE_DEVICE_TABLE(isapnp, ultra_device_ids); 111MODULE_DEVICE_TABLE(isapnp, ultra_device_ids);
113#endif 112#endif
114 113
115 114
116#define START_PG 0x00 /* First page of TX buffer */ 115#define START_PG 0x00 /* First page of TX buffer */
117 116
118#define ULTRA_CMDREG 0 /* Offset to ASIC command register. */ 117#define ULTRA_CMDREG 0 /* Offset to ASIC command register. */
@@ -123,7 +122,7 @@ MODULE_DEVICE_TABLE(isapnp, ultra_device_ids);
123#define ULTRA_NIC_OFFSET 16 /* NIC register offset from the base_addr. */ 122#define ULTRA_NIC_OFFSET 16 /* NIC register offset from the base_addr. */
124#define ULTRA_IO_EXTENT 32 123#define ULTRA_IO_EXTENT 32
125#define EN0_ERWCNT 0x08 /* Early receive warning count. */ 124#define EN0_ERWCNT 0x08 /* Early receive warning count. */
126 125
127#ifdef CONFIG_NET_POLL_CONTROLLER 126#ifdef CONFIG_NET_POLL_CONTROLLER
128static void ultra_poll(struct net_device *dev) 127static void ultra_poll(struct net_device *dev)
129{ 128{
@@ -537,7 +536,7 @@ ultra_close_card(struct net_device *dev)
537 return 0; 536 return 0;
538} 537}
539 538
540 539
541#ifdef MODULE 540#ifdef MODULE
542#define MAX_ULTRA_CARDS 4 /* Max number of Ultra cards per module */ 541#define MAX_ULTRA_CARDS 4 /* Max number of Ultra cards per module */
543static struct net_device *dev_ultra[MAX_ULTRA_CARDS]; 542static struct net_device *dev_ultra[MAX_ULTRA_CARDS];