--- a/backport-include/linux/kconfig.h +++ b/backport-include/linux/kconfig.h @@ -5,6 +5,8 @@ #include_next #endif +#if LINUX_VERSION_CODE < KERNEL_VERSION(3,4,0) + #ifndef __ARG_PLACEHOLDER_1 #define __ARG_PLACEHOLDER_1 0, #define config_enabled(cfg) _config_enabled(cfg) @@ -16,6 +18,7 @@ * 3.1 - 3.3 had a broken version of this, so undef * (they didn't have __ARG_PLACEHOLDER_1) */ + #undef IS_ENABLED #define IS_ENABLED(option) \ (config_enabled(option) || config_enabled(option##_MODULE)) @@ -24,6 +27,8 @@ #undef IS_BUILTIN #define IS_BUILTIN(option) config_enabled(option) +#endif + #ifndef IS_REACHABLE /* * IS_REACHABLE(CONFIG_FOO) evaluates to 1 if the currently compiled