diff options
| author | Andrew F. Davis <afd@ti.com> | 2016-06-14 11:13:04 -0500 |
|---|---|---|
| committer | Sebastian Reichel <sre@kernel.org> | 2016-06-15 16:02:50 +0200 |
| commit | e01957abd4cb3816a1eaaf191b16de182ebb333e (patch) | |
| tree | 17e4e4cdae2b6bcf4d8a6353cc592228147b8f4d | |
| parent | 3c13ab1d96e1924ef73b1a20c1ccccc993b6fb58 (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>
| -rw-r--r-- | Documentation/DocBook/device-drivers.tmpl | 2 | ||||
| -rw-r--r-- | drivers/hsi/Makefile | 3 | ||||
| -rw-r--r-- | drivers/hsi/hsi_core.c (renamed from drivers/hsi/hsi.c) | 0 |
3 files changed, 3 insertions, 2 deletions
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 </para> !Iinclude/linux/hsi/hsi.h -!Edrivers/hsi/hsi.c +!Edrivers/hsi/hsi_core.c </chapter> <chapter id="pwm"> 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 |