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 'topic/intel8x0' into for-linus
[firefly-linux-kernel-4.4.55.git]
/
include
/
linux
/
concap.h
diff --git
a/include/linux/concap.h
b/include/linux/concap.h
index 27304651d700ef7048294e4e001a96d099ce356a..977acb3d1fb2ee81534b5906b3817f90455454ac 100644
(file)
--- a/
include/linux/concap.h
+++ b/
include/linux/concap.h
@@
-8,7
+8,7
@@
#ifndef _LINUX_CONCAP_H
#define _LINUX_CONCAP_H
-#ifdef __KERNEL__
+
#include <linux/skbuff.h>
#include <linux/netdevice.h>
@@
-110,4
+110,3
@@
extern int concap_nop(struct concap_proto *cprot);
*/
extern int concap_drop_skb(struct concap_proto *cprot, struct sk_buff *skb);
#endif
-#endif