Merge branches 'release', 'misc' and 'misc-2.6.25' into release

[linux-2.6-omap-h63xx.git] / include / net / ip6_route.h

diff --git a/include/net/ip6_route.h b/include/net/ip6_route.h
index 5456fdd6d047b1e8149814a623ee77ed56670970..faac0eee1ef3d934482209406d7e4ac406760379 100644 (file)
--- a/include/net/ip6_route.h
+++ b/include/net/ip6_route.h
@@ -43,14 +43,12 @@ extern struct rt6_info      ip6_prohibit_entry;
 extern struct rt6_info ip6_blk_hole_entry;
 #endif
 
-extern int ip6_rt_gc_interval;
-
 extern void                    ip6_route_input(struct sk_buff *skb);
 
 extern struct dst_entry *      ip6_route_output(struct sock *sk,
                                                 struct flowi *fl);
 
-extern void                    ip6_route_init(void);
+extern int                     ip6_route_init(void);
 extern void                    ip6_route_cleanup(void);
 
 extern int                     ipv6_route_ioctl(unsigned int cmd, void __user *arg);