diff options
| author | Luca Weiss <luca@z3ntu.xyz> | 2021-09-28 19:11:57 +0200 |
|---|---|---|
| committer | Jakub Kicinski <kuba@kernel.org> | 2021-09-28 17:36:43 -0700 |
| commit | a365023a76f231cc2fc6e33797e66f3bcaa9f9a9 (patch) | |
| tree | 9b1c79ddd0473b03aec72642e399f2f16806d3ba /net | |
| parent | 3d5f12d4ff7879bc134232e25ef44cc82b83a41a (diff) | |
| download | linux-a365023a76f231cc2fc6e33797e66f3bcaa9f9a9.tar.gz | |
net: qrtr: combine nameservice into main module
Previously with CONFIG_QRTR=m a separate ns.ko would be built which wasn't done on purpose and should be included in qrtr.ko. Rename qrtr.c to af_qrtr.c so we can build a qrtr.ko with both af_qrtr.c and ns.c. Signed-off-by: Luca Weiss <luca@z3ntu.xyz> Reviewed-by: Bjorn Andersson <bjorn.andersson@linaro.org> Tested-By: Steev Klimaszewski <steev@kali.org> Reviewed-by: Manivannan Sadhasivam <mani@kernel.org> Link: https://lore.kernel.org/r/20210928171156.6353-1-luca@z3ntu.xyz Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Diffstat (limited to 'net')
| -rw-r--r-- | net/qrtr/Makefile | 3 | ||||
| -rw-r--r-- | net/qrtr/af_qrtr.c (renamed from net/qrtr/qrtr.c) | 0 |
2 files changed, 2 insertions, 1 deletions
diff --git a/net/qrtr/Makefile b/net/qrtr/Makefile index 1b1411d158a7..8e0605f88a73 100644 --- a/net/qrtr/Makefile +++ b/net/qrtr/Makefile @@ -1,5 +1,6 @@ # SPDX-License-Identifier: GPL-2.0-only -obj-$(CONFIG_QRTR) := qrtr.o ns.o +obj-$(CONFIG_QRTR) += qrtr.o +qrtr-y := af_qrtr.o ns.o obj-$(CONFIG_QRTR_SMD) += qrtr-smd.o qrtr-smd-y := smd.o diff --git a/net/qrtr/qrtr.c b/net/qrtr/af_qrtr.c index ec2322529727..ec2322529727 100644 --- a/net/qrtr/qrtr.c +++ b/net/qrtr/af_qrtr.c |