summaryrefslogtreecommitdiffstats
path: root/security/selinux/netnode.c
diff options
context:
space:
mode:
authorIngo Molnar <mingo@elte.hu>2008-07-15 13:45:59 +0200
committerIngo Molnar <mingo@elte.hu>2008-07-15 13:45:59 +0200
commit91d0322bef047e2916b3e52741411bffc63929cb (patch)
tree44c4fd13cc17755a6db8a3d70cffb86e57a838dc /security/selinux/netnode.c
parent065cb3dfe24978651caedfa54da585388ad15dde (diff)
parent50515af207d410c9f228380e529c56f43c3de0bd (diff)
downloadtalos-op-linux-91d0322bef047e2916b3e52741411bffc63929cb.tar.gz
talos-op-linux-91d0322bef047e2916b3e52741411bffc63929cb.zip
Merge branch 'linus' into x86/urgent
Diffstat (limited to 'security/selinux/netnode.c')
-rw-r--r--security/selinux/netnode.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/security/selinux/netnode.c b/security/selinux/netnode.c
index b6ccd09379f1..7100072bb1b0 100644
--- a/security/selinux/netnode.c
+++ b/security/selinux/netnode.c
@@ -38,7 +38,6 @@
#include <linux/ipv6.h>
#include <net/ip.h>
#include <net/ipv6.h>
-#include <asm/bug.h>
#include "netnode.h"
#include "objsec.h"
OpenPOWER on IntegriCloud