summaryrefslogtreecommitdiffstats
path: root/include/net
diff options
context:
space:
mode:
authorandrew hendry <andrew.hendry@gmail.com>2009-11-24 16:15:26 +0100
committerDavid S. Miller <davem@davemloft.net>2009-11-29 09:24:59 +0100
commit2f5517aefcfbdd7fdf0f03b13d292a10d445887f (patch)
treedfceca6e5ce5a6de91f33f1d0f20e50fd55361ed /include/net
parentNET: smc91x: convert to dev_pm_ops (diff)
downloadlinux-2f5517aefcfbdd7fdf0f03b13d292a10d445887f.tar.xz
linux-2f5517aefcfbdd7fdf0f03b13d292a10d445887f.zip
X25: Move SYSCTL ifdefs into header
Moves the CONFIG_SYSCTL ifdefs in x25_init into header. Signed-off-by: Andrew Hendry <andrew.hendry@gmail.com> Acked-by: "Eric W. Biederman" <ebiederm@xmission.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include/net')
-rw-r--r--include/net/x25.h6
1 files changed, 6 insertions, 0 deletions
diff --git a/include/net/x25.h b/include/net/x25.h
index 2cda04011568..9baa07dc7d17 100644
--- a/include/net/x25.h
+++ b/include/net/x25.h
@@ -287,8 +287,14 @@ extern unsigned long x25_display_timer(struct sock *);
extern void x25_check_rbuf(struct sock *);
/* sysctl_net_x25.c */
+#ifdef CONFIG_SYSCTL
extern void x25_register_sysctl(void);
extern void x25_unregister_sysctl(void);
+#else
+static inline void x25_register_sysctl(void) {};
+static inline void x25_unregister_sysctl(void) {};
+#endif /* CONFIG_SYSCTL */
+
struct x25_skb_cb {
unsigned flags;
};