summaryrefslogtreecommitdiff
path: root/include/linux/errqueue.h
diff options
context:
space:
mode:
authorJeff Garzik <jeff@garzik.org>2006-06-23 06:51:46 +0400
committerJeff Garzik <jeff@garzik.org>2006-06-23 06:51:46 +0400
commitdbe1ab9514c231c9b062140a107d9dea0eabefcc (patch)
tree0001c7143cf923fc704215f0a0e54221e9e5cbb9 /include/linux/errqueue.h
parent612eff0e3715a6faff5ba1b74873b99e036c59fe (diff)
parentd588fcbe5a7ba8bba2cebf7799ab2d573717a806 (diff)
downloadlinux-dbe1ab9514c231c9b062140a107d9dea0eabefcc.tar.xz
Merge branch 'master' into upstream
Diffstat (limited to 'include/linux/errqueue.h')
-rw-r--r--include/linux/errqueue.h1
1 files changed, 0 insertions, 1 deletions
diff --git a/include/linux/errqueue.h b/include/linux/errqueue.h
index 174582fedb8b..408118a07763 100644
--- 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>