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/bmac.c | |
| parent | 216f5f51aa02f8b113aa620ebc14a9631a217a00 (diff) | |
Merge with Linux 2.3.32.
Diffstat (limited to 'drivers/net/bmac.c')
| -rw-r--r-- | drivers/net/bmac.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/bmac.c b/drivers/net/bmac.c index 928718b7e..cc1ce55a7 100644 --- a/drivers/net/bmac.c +++ b/drivers/net/bmac.c @@ -166,7 +166,7 @@ static void bmac_txdma_intr(int irq, void *dev_id, struct pt_regs *regs); static void bmac_rxdma_intr(int irq, void *dev_id, struct pt_regs *regs); static void bmac_set_timeout(struct net_device *dev); static void bmac_tx_timeout(unsigned long data); -static int bmac_proc_info ( char *buffer, char **start, off_t offset, int length, int dummy); +static int bmac_proc_info ( char *buffer, char **start, off_t offset, int length); static int bmac_output(struct sk_buff *skb, struct net_device *dev); static void bmac_start(struct net_device *dev); @@ -1560,7 +1560,7 @@ static void dump_dbdma(volatile struct dbdma_cmd *cp,int count) #endif static int -bmac_proc_info(char *buffer, char **start, off_t offset, int length, int dummy) +bmac_proc_info(char *buffer, char **start, off_t offset, int length) { int len = 0; off_t pos = 0; |