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/x25 | |
| parent | 216f5f51aa02f8b113aa620ebc14a9631a217a00 (diff) | |
Merge with Linux 2.3.32.
Diffstat (limited to 'net/x25')
| -rw-r--r-- | net/x25/af_x25.c | 2 | ||||
| -rw-r--r-- | net/x25/x25_route.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/net/x25/af_x25.c b/net/x25/af_x25.c index c77cb79a7..82b39c1b5 100644 --- a/net/x25/af_x25.c +++ b/net/x25/af_x25.c @@ -1171,7 +1171,7 @@ static int x25_ioctl(struct socket *sock, unsigned int cmd, unsigned long arg) return 0; } -static int x25_get_info(char *buffer, char **start, off_t offset, int length, int dummy) +static int x25_get_info(char *buffer, char **start, off_t offset, int length) { struct sock *s; struct net_device *dev; diff --git a/net/x25/x25_route.c b/net/x25/x25_route.c index 383855135..4cb51300b 100644 --- a/net/x25/x25_route.c +++ b/net/x25/x25_route.c @@ -217,7 +217,7 @@ int x25_route_ioctl(unsigned int cmd, void *arg) return 0; } -int x25_routes_get_info(char *buffer, char **start, off_t offset, int length, int dummy) +int x25_routes_get_info(char *buffer, char **start, off_t offset, int length) { struct x25_route *x25_route; int len = 0; |