From 2b693ac9f2b9d57b430140e1d527af18f1d606f5 Mon Sep 17 00:00:00 2001 From: Arnd Bergmann Date: Wed, 29 Jun 2016 16:38:30 +0200 Subject: [PATCH] UPSTREAM: extcon: link devres into core module Splitting the resource-managed functions into a separate module means that the extcon core now fails to build because the internal "extcon_dev_allocate" symbol is not exported: ERROR: extcon_dev_allocate [drivers/extcon/devres.ko] undefined! My guess is that the intention was not to have two separate modules (which could be fixed by adding an export, plus the normal MODULE_AUTHOR/MODULE_LICENSE/... fields), but have two source files in the same module. This fixes the Makefile accordingly, making the name of the module extcon_core.ko, which is created from building both extcon.c and devres.c. Fixes: b225d00f3ad2 ("extcon: Split out the resource-managed functions from extcon core") Signed-off-by: Arnd Bergmann Signed-off-by: Chanwoo Choi (cherry picked from commit af61f96109b73fefbe0589c320d2219567f4f660 git://git.kernel.org/pub/scm/linux/kernel/git/chanwoo/extcon.git extcon-next) Change-Id: I8a319f46437cd3d6ce98a4f6ac5d1c56930c9c76 Signed-off-by: Chris Zhong --- drivers/extcon/Makefile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/extcon/Makefile b/drivers/extcon/Makefile index 5800e0efbc25..65c51afe5ec4 100644 --- a/drivers/extcon/Makefile +++ b/drivers/extcon/Makefile @@ -2,7 +2,8 @@ # Makefile for external connector class (extcon) devices # -obj-$(CONFIG_EXTCON) += extcon.o devres.o +obj-$(CONFIG_EXTCON) += extcon-core.o +extcon-core-objs += extcon.o devres.o obj-$(CONFIG_EXTCON_ADC_JACK) += extcon-adc-jack.o obj-$(CONFIG_EXTCON_ARIZONA) += extcon-arizona.o obj-$(CONFIG_EXTCON_AXP288) += extcon-axp288.o -- 2.34.1