Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-next-2.6

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

diff --git a/include/linux/errqueue.h b/include/linux/errqueue.h
index 174582fedb8b01825f4444e5f8cf4ea86c2ef93c..92f8d4fab32be96bd86e29612b78c6a8cb1b952b 100644 (file)
--- a/include/linux/errqueue.h
+++ b/include/linux/errqueue.h
@@ -21,7 +21,6 @@ struct sock_extended_err
 
 #ifdef __KERNEL__
 
-#include <linux/config.h>
 #include <net/ip.h>
 #if defined(CONFIG_IPV6) || defined (CONFIG_IPV6_MODULE)
 #include <linux/ipv6.h>
@@ -39,7 +38,7 @@ struct sock_exterr_skb
        } header;
        struct sock_extended_err        ee;
        u16                             addr_offset;
-       u16                             port;
+       __be16                          port;
 };
 
 #endif