Fresh pull from upstream 17.01 branch
[librecmc/librecmc.git] / package / kernel / mac80211 / patches / 004-kconfig_backport_fix.patch
1 --- a/backport-include/linux/kconfig.h
2 +++ b/backport-include/linux/kconfig.h
3 @@ -5,6 +5,8 @@
4  #include_next <linux/kconfig.h>
5  #endif
6  
7 +#if LINUX_VERSION_CODE < KERNEL_VERSION(3,4,0)
8 +
9  #ifndef __ARG_PLACEHOLDER_1
10  #define __ARG_PLACEHOLDER_1 0,
11  #define config_enabled(cfg) _config_enabled(cfg)
12 @@ -16,6 +18,7 @@
13   * 3.1 - 3.3 had a broken version of this, so undef
14   * (they didn't have __ARG_PLACEHOLDER_1)
15   */
16 +
17  #undef IS_ENABLED
18  #define IS_ENABLED(option) \
19          (config_enabled(option) || config_enabled(option##_MODULE))
20 @@ -24,6 +27,8 @@
21  #undef IS_BUILTIN
22  #define IS_BUILTIN(option) config_enabled(option)
23  
24 +#endif
25 +
26  #ifndef IS_REACHABLE
27  /*
28   * IS_REACHABLE(CONFIG_FOO) evaluates to 1 if the currently compiled