summaryrefslogtreecommitdiffstats
path: root/scripts/selinux/genheaders/genheaders.c
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2019-05-03 04:14:21 +0200
committerDavid S. Miller <davem@davemloft.net>2019-05-03 04:14:21 +0200
commitff24e4980a68d83090a02fda081741a410fe8eef (patch)
tree4d874dfcaf2bb8c3abc2446af9447a983402c0ae /scripts/selinux/genheaders/genheaders.c
parentnet: ll_temac: Fix typo bug for 32-bit (diff)
parentMerge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net (diff)
downloadlinux-ff24e4980a68d83090a02fda081741a410fe8eef.tar.xz
linux-ff24e4980a68d83090a02fda081741a410fe8eef.zip
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Three trivial overlapping conflicts. Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'scripts/selinux/genheaders/genheaders.c')
-rw-r--r--scripts/selinux/genheaders/genheaders.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/scripts/selinux/genheaders/genheaders.c b/scripts/selinux/genheaders/genheaders.c
index 1ceedea847dd..544ca126a8a8 100644
--- a/scripts/selinux/genheaders/genheaders.c
+++ b/scripts/selinux/genheaders/genheaders.c
@@ -9,7 +9,6 @@
#include <string.h>
#include <errno.h>
#include <ctype.h>
-#include <sys/socket.h>
struct security_class_mapping {
const char *name;