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 /net/bridge/br.c | |
| parent | 216f5f51aa02f8b113aa620ebc14a9631a217a00 (diff) | |
Merge with Linux 2.3.32.
Diffstat (limited to 'net/bridge/br.c')
| -rw-r--r-- | net/bridge/br.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/net/bridge/br.c b/net/bridge/br.c index dc70cfe5d..4947a9b89 100644 --- a/net/bridge/br.c +++ b/net/bridge/br.c @@ -52,7 +52,6 @@ * */ -#include <linux/config.h> #include <linux/errno.h> #include <linux/types.h> #include <linux/socket.h> @@ -807,7 +806,7 @@ static void hold_timer_expiry(int port_no) /* (4.7.8) */ /* Vova Oksman: Write the buffer (contents of the Bridge table) */ /* to a PROCfs file */ -int br_tree_get_info(char *buffer, char **start, off_t offset, int length, int dummy) +static int br_tree_get_info(char *buffer, char **start, off_t offset, int length) { int size; int len=0; |