Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394...

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

diff --git a/include/net/transp_v6.h b/include/net/transp_v6.h
index 902e6c6bc7938b0676bad2d61476a1452dccd22a..27394e0447d88d9b5d788b14b8e4bed582b45817 100644 (file)
--- a/include/net/transp_v6.h
+++ b/include/net/transp_v6.h
@@ -27,13 +27,8 @@ extern int                           rawv6_init(void);
 extern void                            rawv6_exit(void);
 extern int                             udpv6_init(void);
 extern void                            udpv6_exit(void);
-#ifdef CONFIG_IP_UDPLITE
 extern int                             udplitev6_init(void);
 extern void                            udplitev6_exit(void);
-#else
-static inline int udplitev6_init(void) { return 0; }
-static inline void udplitev6_exit(void) { }
-#endif
 extern int                             tcpv6_init(void);
 extern void                            tcpv6_exit(void);