Merge remote-tracking branch 'net-next/master'

[karo-tx-linux.git] / net / dccp / ipv6.h

diff --git a/net/dccp/ipv6.h b/net/dccp/ipv6.h
index e4d4e93092702001a7dd050ef290932595f777b4..af259e15e7f0b8c4cb09381bba5423a59c7e5540 100644 (file)
--- a/net/dccp/ipv6.h
+++ b/net/dccp/ipv6.h
@@ -11,7 +11,6 @@
  *     published by the Free Software Foundation.
  */
 
-#include <linux/config.h>
 #include <linux/dccp.h>
 #include <linux/ipv6.h>
 
@@ -26,12 +25,10 @@ struct dccp6_sock {
 
 struct dccp6_request_sock {
        struct dccp_request_sock  dccp;
-       struct inet6_request_sock inet6;
 };
 
 struct dccp6_timewait_sock {
        struct inet_timewait_sock   inet;
-       struct inet6_timewait_sock  tw6;
 };
 
 #endif /* _DCCP_IPV6_H */