diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2000-11-23 02:00:47 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2000-11-23 02:00:47 +0000 |
| commit | 06615f62b17d7de6e12d2f5ec6b88cf30af08413 (patch) | |
| tree | 8766f208847d4876a6db619aebbf54d53b76eb44 /drivers/net/wan | |
| parent | fa9bdb574f4febb751848a685d9a9017e04e1d53 (diff) | |
Merge with Linux 2.4.0-test10.
Diffstat (limited to 'drivers/net/wan')
| -rw-r--r-- | drivers/net/wan/cosa.c | 6 | ||||
| -rw-r--r-- | drivers/net/wan/sdlamain.c | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/drivers/net/wan/cosa.c b/drivers/net/wan/cosa.c index 5ab238eb0..e4fa70c31 100644 --- a/drivers/net/wan/cosa.c +++ b/drivers/net/wan/cosa.c @@ -228,7 +228,7 @@ static int cosa_major = 117; /* Maybe the following should be allocated dynamically */ static struct cosa_data cosa_cards[MAX_CARDS]; -static int nr_cards = 0; +static int nr_cards; #ifdef COSA_ISA_AUTOPROBE static int io[MAX_CARDS+1] = { 0x220, 0x228, 0x210, 0x218, 0, }; @@ -365,7 +365,7 @@ static void debug_status_out(struct cosa_data *cosa, int status); /* ---------- Initialization stuff ---------- */ -static devfs_handle_t devfs_handle = NULL; +static devfs_handle_t devfs_handle; #ifdef MODULE int init_module(void) @@ -1387,7 +1387,7 @@ static void cosa_kick(struct cosa_data *cosa) */ static int cosa_dma_able(struct channel_data *chan, char *buf, int len) { - static int count = 0; + static int count; unsigned long b = (unsigned long)buf; if (b+len >= MAX_DMA_ADDRESS) return 0; diff --git a/drivers/net/wan/sdlamain.c b/drivers/net/wan/sdlamain.c index 6d46b2e46..520b1341a 100644 --- a/drivers/net/wan/sdlamain.c +++ b/drivers/net/wan/sdlamain.c @@ -102,8 +102,8 @@ static char drvname[] = "wanpipe"; static char fullname[] = "WANPIPE(tm) Multiprotocol Driver"; static char copyright[] = "(c) 1995-1999 Sangoma Technologies Inc."; static int ncards = CONFIG_WANPIPE_CARDS; -static int active = 0; /* number of active cards */ -static sdla_t* card_array = NULL; /* adapter data space */ +static int active; /* number of active cards */ +static sdla_t* card_array; /* adapter data space */ /* Task queue element for creating a 'thread' */ static struct tq_struct sdla_tq = |