Merge master.kernel.org:/pub/scm/linux/kernel/git/davej/configh

[linux-2.6] / net / ipv4 / datagram.c

diff --git a/net/ipv4/datagram.c b/net/ipv4/datagram.c
index 3fd49f4282accb3b4f546c7fb937e0dd11b9d7f9..7b068a891953aae4d9e377438319815c3439259b 100644 (file)
--- a/net/ipv4/datagram.c
+++ b/net/ipv4/datagram.c
@@ -11,11 +11,11 @@
  *     2 of the License, or (at your option) any later version.
  */
 
-#include <linux/config.h>
 #include <linux/types.h>
 #include <linux/module.h>
 #include <linux/ip.h>
 #include <linux/in.h>
+#include <net/ip.h>
 #include <net/sock.h>
 #include <net/route.h>
 #include <net/tcp_states.h>
@@ -25,7 +25,7 @@ int ip4_datagram_connect(struct sock *sk, struct sockaddr *uaddr, int addr_len)
        struct inet_sock *inet = inet_sk(sk);
        struct sockaddr_in *usin = (struct sockaddr_in *) uaddr;
        struct rtable *rt;
-       u32 saddr;
+       __be32 saddr;
        int oif;
        int err;