diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2000-02-04 07:40:19 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2000-02-04 07:40:19 +0000 |
| commit | 33263fc5f9ac8e8cb2b22d06af3ce5ac1dd815e4 (patch) | |
| tree | 2d1b86a40bef0958a68cf1a2eafbeb0667a70543 /drivers/net/hamradio | |
| parent | 216f5f51aa02f8b113aa620ebc14a9631a217a00 (diff) | |
Merge with Linux 2.3.32.
Diffstat (limited to 'drivers/net/hamradio')
| -rw-r--r-- | drivers/net/hamradio/bpqether.c | 2 | ||||
| -rw-r--r-- | drivers/net/hamradio/scc.c | 4 | ||||
| -rw-r--r-- | drivers/net/hamradio/yam.c | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/drivers/net/hamradio/bpqether.c b/drivers/net/hamradio/bpqether.c index 421803aae..55ed5254e 100644 --- a/drivers/net/hamradio/bpqether.c +++ b/drivers/net/hamradio/bpqether.c @@ -451,7 +451,7 @@ static char * bpq_print_ethaddr(unsigned char *e) return buf; } -int bpq_get_info(char *buffer, char **start, off_t offset, int length, int dummy) +static int bpq_get_info(char *buffer, char **start, off_t offset, int length) { struct bpqdev *bpqdev; int len = 0; diff --git a/drivers/net/hamradio/scc.c b/drivers/net/hamradio/scc.c index a46cff85f..4de421874 100644 --- a/drivers/net/hamradio/scc.c +++ b/drivers/net/hamradio/scc.c @@ -1571,7 +1571,7 @@ static int scc_net_setup(struct scc_channel *scc, unsigned char *name, int addev unsigned char *buf; struct net_device *dev; - if (dev_get(name) != NULL) + if (dev_get(name)) { printk(KERN_INFO "Z8530drv: device %s already exists.\n", name); return -EEXIST; @@ -2068,7 +2068,7 @@ static struct net_device_stats *scc_net_get_stats(struct net_device *dev) /* ******************************************************************** */ -static int scc_net_get_info(char *buffer, char **start, off_t offset, int length, int dummy) +static int scc_net_get_info(char *buffer, char **start, off_t offset, int length) { struct scc_channel *scc; struct scc_kiss *kiss; diff --git a/drivers/net/hamradio/yam.c b/drivers/net/hamradio/yam.c index d50539d64..e99d4c7a9 100644 --- a/drivers/net/hamradio/yam.c +++ b/drivers/net/hamradio/yam.c @@ -781,7 +781,7 @@ static void yam_interrupt(int irq, void *dev_id, struct pt_regs *regs) } } -static int yam_net_get_info(char *buffer, char **start, off_t offset, int length, int dummy) +static int yam_net_get_info(char *buffer, char **start, off_t offset, int length) { int len = 0; int i; |