summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohan Hovold <johan@kernel.org>2019-12-18 16:11:54 +0300
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2019-12-18 17:01:41 +0300
commitc3a4e5527351c73b665596d4dd27ce482e93f50c (patch)
tree504142c106011d81f9878dd7b059a7402b894d0b
parent6dbd54e4154dfe386b3333687de15be239576617 (diff)
downloadlinux-c3a4e5527351c73b665596d4dd27ce482e93f50c.tar.xz
Revert "serdev: simplify Makefile"
This reverts commit 54edb425346a4d5e17f7e54e8c97c0d0eac26315. The offending commit caused serdev core to always be built-in, something which breaks the build of dependent modules when serdev is being built as a module: ERROR: "__serdev_device_driver_register" [drivers/gnss/gnss-ubx.ko] undefined! ... make[2]: *** [/home/johan/work/omicron/src/linux/scripts/Makefile.modpost:94: __modpost] Error 1 Reported-by: kbuild test robot <lkp@intel.com> Signed-off-by: Johan Hovold <johan@kernel.org> Cc: Uwe Kleine-König <u.kleine-koenig@pengutronix.de> Link: https://lore.kernel.org/r/20191218131154.13702-1-johan@kernel.org Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r--drivers/tty/serdev/Makefile2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/tty/serdev/Makefile b/drivers/tty/serdev/Makefile
index f71bb931735b..078417e5b068 100644
--- a/drivers/tty/serdev/Makefile
+++ b/drivers/tty/serdev/Makefile
@@ -1,6 +1,6 @@
# SPDX-License-Identifier: GPL-2.0
serdev-objs := core.o
-obj-y += serdev.o
+obj-$(CONFIG_SERIAL_DEV_BUS) += serdev.o
obj-$(CONFIG_SERIAL_DEV_CTRL_TTYPORT) += serdev-ttyport.o