Merge branch 'for-3.7' of git://git.infradead.org/users/dedekind/l2-mtd

Conflicts:
	drivers/mtd/nand/nand_base.c

1 files changed, 1 insertions, 24 deletions

diff --git a/include/linux/errqueue.h b/include/linux/errqueue.h
index fd0628be45ce..9ca23fcfb5d7 100644
--- a/include/linux/errqueue.h
+++ b/include/linux/errqueue.h
@@ -1,33 +1,12 @@
 #ifndef _LINUX_ERRQUEUE_H
 #define _LINUX_ERRQUEUE_H 1
 
-#include <linux/types.h>
-
-struct sock_extended_err {
-        __u32   ee_errno;       
-        __u8    ee_origin;
-        __u8    ee_type;
-        __u8    ee_code;
-        __u8    ee_pad;
-        __u32   ee_info;
-        __u32   ee_data;
-};
-
-#define SO_EE_ORIGIN_NONE       0
-#define SO_EE_ORIGIN_LOCAL      1
-#define SO_EE_ORIGIN_ICMP       2
-#define SO_EE_ORIGIN_ICMP6      3
-#define SO_EE_ORIGIN_TXSTATUS   4
-#define SO_EE_ORIGIN_TIMESTAMPING SO_EE_ORIGIN_TXSTATUS
-
-#define SO_EE_OFFENDER(ee)      ((struct sockaddr*)((ee)+1))
-
-#ifdef __KERNEL__
 
 #include <net/ip.h>
 #if IS_ENABLED(CONFIG_IPV6)
 #include <linux/ipv6.h>
 #endif
+#include <uapi/linux/errqueue.h>
 
 #define SKB_EXT_ERR(skb) ((struct sock_exterr_skb *) ((skb)->cb))
 
@@ -44,5 +23,3 @@ struct sock_exterr_skb {
 };
 
 #endif
-
-#endif