projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'next' of git://git.monstr.eu/linux-2.6-microblaze
[firefly-linux-kernel-4.4.55.git]
/
net
/
netlabel
/
netlabel_kapi.c
diff --git
a/net/netlabel/netlabel_kapi.c
b/net/netlabel/netlabel_kapi.c
index 1b83e0009d8d4b7fa965dc21552699b905a2ca04..b528dd928d3c2fd580ace2d5d10cf947ab764b19 100644
(file)
--- a/
net/netlabel/netlabel_kapi.c
+++ b/
net/netlabel/netlabel_kapi.c
@@
-39,7
+39,7
@@
#include <net/netlabel.h>
#include <net/cipso_ipv4.h>
#include <asm/bug.h>
-#include <
asm
/atomic.h>
+#include <
linux
/atomic.h>
#include "netlabel_domainhash.h"
#include "netlabel_unlabeled.h"