aboutsummaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorAndrew F. Davis <afd@ti.com>2016-06-14 11:13:04 -0500
committerSebastian Reichel <sre@kernel.org>2016-06-15 16:02:50 +0200
commite01957abd4cb3816a1eaaf191b16de182ebb333e (patch)
tree17e4e4cdae2b6bcf4d8a6353cc592228147b8f4d /drivers
parent3c13ab1d96e1924ef73b1a20c1ccccc993b6fb58 (diff)
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 <lkp@intel.com> Signed-off-by: Andrew F. Davis <afd@ti.com> Signed-off-by: Sebastian Reichel <sre@kernel.org>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/hsi/Makefile3
-rw-r--r--drivers/hsi/hsi_core.c (renamed from drivers/hsi/hsi.c)0
2 files changed, 2 insertions, 1 deletions
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
index d7ce07ad67f3..d7ce07ad67f3 100644
--- a/drivers/hsi/hsi.c
+++ b/drivers/hsi/hsi_core.c

Privacy Policy