Merge branch 'for-linus' of git://oss.sgi.com:8090/xfs/xfs-2.6

[linux-2.6] / include / linux / dccp.h

diff --git a/include/linux/dccp.h b/include/linux/dccp.h
index 0e44a3e5208d1262b4852d4835266e6ccde2353d..f3fc4392e93d74a470c94c40813851e5042d3518 100644 (file)
--- a/include/linux/dccp.h
+++ b/include/linux/dccp.h
@@ -391,7 +391,6 @@ struct dccp_opt_pend {
        struct dccp_opt_conf    *dccpop_sc;
 };
 
-extern void __dccp_minisock_init(struct dccp_minisock *dmsk);
 extern void dccp_minisock_init(struct dccp_minisock *dmsk);
 
 extern int dccp_parse_options(struct sock *sk, struct sk_buff *skb);