summaryrefslogtreecommitdiffstats
path: root/drivers/extcon
diff options
context:
space:
mode:
authorArnd Bergmann <arnd@arndb.de>2016-06-29 16:38:30 +0200
committerChanwoo Choi <cw00.choi@samsung.com>2016-06-30 22:18:40 +0900
commitaf61f96109b73fefbe0589c320d2219567f4f660 (patch)
tree57d263dec1f8bd89134940777eb1e6860ac5a8db /drivers/extcon
parentbc92126012c8c84988eebbbf9c8a246949b07462 (diff)
downloadblackbird-op-linux-af61f96109b73fefbe0589c320d2219567f4f660.tar.gz
blackbird-op-linux-af61f96109b73fefbe0589c320d2219567f4f660.zip
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 <arnd@arndb.de> Signed-off-by: Chanwoo Choi <cw00.choi@samsung.com>
Diffstat (limited to 'drivers/extcon')
-rw-r--r--drivers/extcon/Makefile3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/extcon/Makefile b/drivers/extcon/Makefile
index 423ebc8714c5..972c813c375b 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
OpenPOWER on IntegriCloud