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/appletalk | |
| parent | 216f5f51aa02f8b113aa620ebc14a9631a217a00 (diff) | |
Merge with Linux 2.3.32.
Diffstat (limited to 'net/appletalk')
| -rw-r--r-- | net/appletalk/aarp.c | 2 | ||||
| -rw-r--r-- | net/appletalk/ddp.c | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/net/appletalk/aarp.c b/net/appletalk/aarp.c index 392e01c2c..6590ff316 100644 --- a/net/appletalk/aarp.c +++ b/net/appletalk/aarp.c @@ -1055,7 +1055,7 @@ void aarp_device_down(struct net_device *dev) /* * Called from proc fs */ -int aarp_get_info(char *buffer, char **start, off_t offset, int length, int dummy) +static int aarp_get_info(char *buffer, char **start, off_t offset, int length) { /* we should dump all our AARP entries */ struct aarp_entry *entry; diff --git a/net/appletalk/ddp.c b/net/appletalk/ddp.c index b31a46226..2c576f462 100644 --- a/net/appletalk/ddp.c +++ b/net/appletalk/ddp.c @@ -214,7 +214,7 @@ extern inline void atalk_destroy_socket(struct sock *sk) /* * Called from proc fs */ -int atalk_get_info(char *buffer, char **start, off_t offset, int length, int dummy) +static int atalk_get_info(char *buffer, char **start, off_t offset, int length) { struct sock *s; int len=0; @@ -1038,7 +1038,7 @@ static int atrtr_ioctl(unsigned int cmd, void *arg) /* Called from proc fs - just make it print the ifaces neatly */ -int atalk_if_get_info(char *buffer, char **start, off_t offset, int length, int dummy) +static int atalk_if_get_info(char *buffer, char **start, off_t offset, int length) { struct atalk_iface *iface; int len=0; @@ -1071,7 +1071,7 @@ int atalk_if_get_info(char *buffer, char **start, off_t offset, int length, int /* Called from proc fs - just make it print the routes neatly */ -int atalk_rt_get_info(char *buffer, char **start, off_t offset, int length, int dummy) +static int atalk_rt_get_info(char *buffer, char **start, off_t offset, int length) { struct atalk_route *rt; int len=0; |