Merge git://git.infradead.org/hdrcleanup-2.6

[deliverable/linux.git] / include / net / ip.h

diff --git a/include/net/ip.h b/include/net/ip.h
index 3900fccf60c7866ad9745adef5c918455b3bf31b..98f90840077186243bf910db40452ba7cfa881d9 100644 (file)
--- a/include/net/ip.h
+++ b/include/net/ip.h
@@ -146,7 +146,6 @@ void ip_send_reply(struct sock *sk, struct sk_buff *skb, struct ip_reply_arg *ar
 struct ipv4_config
 {
        int     log_martians;
-       int     autoconfig;
        int     no_pmtu_disc;
 };