git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'next-i2c' of git://git.fluff.org/bjdooks/linux
[pandora-kernel.git]
/
include
/
net
/
netlabel.h
diff --git
a/include/net/netlabel.h
b/include/net/netlabel.h
index
9db401a
..
f21a16e
100644
(file)
--- a/
include/net/netlabel.h
+++ b/
include/net/netlabel.h
@@
-38,7
+38,7
@@
#include <linux/in6.h>
#include <net/netlink.h>
#include <net/request_sock.h>
-#include <
asm
/atomic.h>
+#include <
linux
/atomic.h>
struct cipso_v4_doi;