diff --git a/[refs] b/[refs] index 310fe6046a0f..3f65dcbdb415 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 322c8a3c364ef4d9ead17e86890c19816b0e262f +refs/heads/master: cc8274f50f2ad9a97a837451f63a0a3e65f7f490 diff --git a/trunk/include/net/ip_fib.h b/trunk/include/net/ip_fib.h index 90d1175f63de..8b12667f7a2b 100644 --- a/trunk/include/net/ip_fib.h +++ b/trunk/include/net/ip_fib.h @@ -266,6 +266,14 @@ static inline void fib_res_put(struct fib_result *res) #ifdef CONFIG_PROC_FS extern int __net_init fib_proc_init(struct net *net); extern void __net_exit fib_proc_exit(struct net *net); +#else +static inline int fib_proc_init(struct net *net) +{ + return 0; +} +static inline void fib_proc_exit(struct net *net) +{ +} #endif #endif /* _NET_FIB_H */