If the HSI core is built as a module hsi_boardinfo may still be built-in as its Kconfig type is bool, which can cause build issues. Fix this by building this code into the HSI core when enabled. Reported-by: kbuild test robot <lkp@xxxxxxxxx> Signed-off-by: Andrew F. Davis <afd@xxxxxx> --- This build error seems to be due to Kconfig symbol CONFIG_HSI_BOARDINFO being a bool but depending on a tristate (CONFIG_HSI). This is normally okay when it is just a flag to enable a feature in source, but the helper code file hsi_boardinfo.c is built as a separate entity when enabled. This patch is probably how it was intended, and is more like how others do this kind of thing. This patch should be applied before the parent patch: drivers/hsi/Makefile | 3 ++- drivers/hsi/{hsi.c => hsi_core.c} | 0 2 files changed, 2 insertions(+), 1 deletion(-) rename drivers/hsi/{hsi.c => hsi_core.c} (100%) diff --git a/drivers/hsi/Makefile b/drivers/hsi/Makefile index 360371e..9694478 100644 --- a/drivers/hsi/Makefile +++ b/drivers/hsi/Makefile @@ -1,7 +1,8 @@ # # Makefile for HSI # -obj-$(CONFIG_HSI_BOARDINFO) += hsi_boardinfo.o obj-$(CONFIG_HSI) += hsi.o +hsi-objs := hsi_core.o +hsi-$(CONFIG_HSI_BOARDINFO) += hsi_boardinfo.o obj-y += controllers/ obj-y += clients/ diff --git a/drivers/hsi/hsi.c b/drivers/hsi/hsi_core.c similarity index 100% rename from drivers/hsi/hsi.c rename to drivers/hsi/hsi_core.c -- 2.8.3 -- To unsubscribe from this list: send the line "unsubscribe linux-gpio" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html