diff options
author | Ralf Baechle <ralf@linux-mips.org> | 2000-03-13 20:55:15 +0000 |
---|---|---|
committer | Ralf Baechle <ralf@linux-mips.org> | 2000-03-13 20:55:15 +0000 |
commit | 1471f525455788c20b130690e0f104df451aeb43 (patch) | |
tree | 3778beba56558beb9a9548ea5b467e9c44ea966f /net/netsyms.c | |
parent | e80d2c5456d30ebba5b0eb8a9d33e17d815d4d83 (diff) |
Merge with Linux 2.3.51.
Diffstat (limited to 'net/netsyms.c')
-rw-r--r-- | net/netsyms.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/net/netsyms.c b/net/netsyms.c index d99e53957..48cd5b503 100644 --- a/net/netsyms.c +++ b/net/netsyms.c @@ -216,8 +216,10 @@ EXPORT_SYMBOL(scm_detach_fds); #if defined(CONFIG_BRIDGE) || defined(CONFIG_BRIDGE_MODULE) EXPORT_SYMBOL(br_handle_frame_hook); +#ifdef CONFIG_INET EXPORT_SYMBOL(br_ioctl_hook); #endif +#endif #ifdef CONFIG_INET /* Internet layer registration */ @@ -534,8 +536,10 @@ EXPORT_SYMBOL(unregister_hipdev); #ifdef CONFIG_SYSCTL EXPORT_SYMBOL(sysctl_wmem_max); EXPORT_SYMBOL(sysctl_rmem_max); +#ifdef CONFIG_INET EXPORT_SYMBOL(sysctl_ip_default_ttl); #endif +#endif #if defined(CONFIG_ATALK) || defined(CONFIG_ATALK_MODULE) #include<linux/if_ltalk.h> |