From e01957abd4cb3816a1eaaf191b16de182ebb333e Mon Sep 17 00:00:00 2001 From: "Andrew F. Davis" Date: Tue, 14 Jun 2016 11:13:04 -0500 Subject: [PATCH] hsi: Build hsi_boardinfo.c into hsi core if enabled 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 Signed-off-by: Andrew F. Davis Signed-off-by: Sebastian Reichel --- Documentation/DocBook/device-drivers.tmpl | 2 +- drivers/hsi/Makefile | 3 ++- drivers/hsi/{hsi.c => hsi_core.c} | 0 3 files changed, 3 insertions(+), 2 deletions(-) rename drivers/hsi/{hsi.c => hsi_core.c} (100%) diff --git a/Documentation/DocBook/device-drivers.tmpl b/Documentation/DocBook/device-drivers.tmpl index de79efdad46c..c245e4eea560 100644 --- a/Documentation/DocBook/device-drivers.tmpl +++ b/Documentation/DocBook/device-drivers.tmpl @@ -511,7 +511,7 @@ X!Ilib/fonts/fonts.c !Iinclude/linux/hsi/hsi.h -!Edrivers/hsi/hsi.c +!Edrivers/hsi/hsi_core.c diff --git a/drivers/hsi/Makefile b/drivers/hsi/Makefile index 360371e134f1..96944783d584 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