浏览代码

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>
Andrew F. Davis 9 年之前
父节点
当前提交
e01957abd4
共有 3 个文件被更改,包括 3 次插入2 次删除
  1. 1 1
      Documentation/DocBook/device-drivers.tmpl
  2. 2 1
      drivers/hsi/Makefile
  3. 0 0
      drivers/hsi/hsi_core.c

+ 1 - 1
Documentation/DocBook/device-drivers.tmpl

@@ -511,7 +511,7 @@ X!Ilib/fonts/fonts.c
      </para>
      </para>
 
 
 !Iinclude/linux/hsi/hsi.h
 !Iinclude/linux/hsi/hsi.h
-!Edrivers/hsi/hsi.c
+!Edrivers/hsi/hsi_core.c
   </chapter>
   </chapter>
 
 
   <chapter id="pwm">
   <chapter id="pwm">

+ 2 - 1
drivers/hsi/Makefile

@@ -1,7 +1,8 @@
 #
 #
 # Makefile for HSI
 # Makefile for HSI
 #
 #
-obj-$(CONFIG_HSI_BOARDINFO)	+= hsi_boardinfo.o
 obj-$(CONFIG_HSI)		+= hsi.o
 obj-$(CONFIG_HSI)		+= hsi.o
+hsi-objs			:= hsi_core.o
+hsi-$(CONFIG_HSI_BOARDINFO)	+= hsi_boardinfo.o
 obj-y				+= controllers/
 obj-y				+= controllers/
 obj-y				+= clients/
 obj-y				+= clients/

+ 0 - 0
drivers/hsi/hsi.c → drivers/hsi/hsi_core.c