diff options
| author | David S. Miller <davem@davemloft.net> | 2017-05-18 22:11:32 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2017-05-18 22:11:32 +0200 |
| commit | c6cd850d6568872f66fc4a4582f34f9b910066ca (patch) | |
| tree | e9a6370f7b0ce110e2916a6288a8fb0ee8323e37 /include | |
| parent | net/mlx5e: Fix possible memory leak (diff) | |
| parent | Merge tag 'md/4.12-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/shli/md (diff) | |
| download | linux-c6cd850d6568872f66fc4a4582f34f9b910066ca.tar.xz linux-c6cd850d6568872f66fc4a4582f34f9b910066ca.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Diffstat (limited to 'include')
| -rw-r--r-- | include/net/x25.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/net/x25.h b/include/net/x25.h index c383aa4edbf0..6d30a01d281d 100644 --- a/include/net/x25.h +++ b/include/net/x25.h @@ -298,10 +298,10 @@ void x25_check_rbuf(struct sock *); /* sysctl_net_x25.c */ #ifdef CONFIG_SYSCTL -void x25_register_sysctl(void); +int x25_register_sysctl(void); void x25_unregister_sysctl(void); #else -static inline void x25_register_sysctl(void) {}; +static inline int x25_register_sysctl(void) { return 0; }; static inline void x25_unregister_sysctl(void) {}; #endif /* CONFIG_SYSCTL */ |