From: Luca Coelho <luciano.coelho@xxxxxxxxx> In kernel v4.9-rc3, config_enabled() was removed, so we can't use it anymore. The IS_BUILTIN macro is undefined then redefined using config_enabled(), which doesn't work anymore. Additionally, it's not necessary to include all these macros if the kernel is >= v3.4. To fix the config_enabled() problem and to avoid backporting unnecessarily, simply gate the backports on < v3.4. Change-Id: I7682ca0cef166e00dd37529da113ab949dfc5c0a Signed-off-by: Luca Coelho <luciano.coelho@xxxxxxxxx> --- backport/backport-include/linux/kconfig.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/backport/backport-include/linux/kconfig.h b/backport/backport-include/linux/kconfig.h index 4fe2a10..4899c7e 100644 --- a/backport/backport-include/linux/kconfig.h +++ b/backport/backport-include/linux/kconfig.h @@ -5,6 +5,7 @@ #include_next <linux/kconfig.h> #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) @@ -36,3 +37,4 @@ #endif #endif +#endif -- 2.10.2 -- To unsubscribe from this list: send the line "unsubscribe backports" in
