projects
/
linux-2.6-microblaze.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'x86/bugs' into x86/core, to pick up pending changes before dependent...
[linux-2.6-microblaze.git]
/
include
/
net
/
tc_wrapper.h
diff --git
a/include/net/tc_wrapper.h
b/include/net/tc_wrapper.h
index
a608546
..
ffe58a0
100644
(file)
--- a/
include/net/tc_wrapper.h
+++ b/
include/net/tc_wrapper.h
@@
-4,7
+4,7
@@
#include <net/pkt_cls.h>
-#if IS_ENABLED(CONFIG_RETPOLINE)
+#if IS_ENABLED(CONFIG_
MITIGATION_
RETPOLINE)
#include <linux/cpufeature.h>
#include <linux/static_key.h>