diff options
author | Jakub Kicinski <kuba@kernel.org> | 2023-07-13 17:33:19 -0700 |
---|---|---|
committer | Jakub Kicinski <kuba@kernel.org> | 2023-07-13 17:33:28 -0700 |
commit | eb1b24a9bb6982bb44b135e3490d3159ba0be4f2 (patch) | |
tree | 1ef056beee29642a6c12db299c680ce104c2e9d7 /drivers/dma/dw-edma/Makefile | |
parent | ba2274dcfda859b8a27193e68ad37bfe4da28ddc (diff) | |
parent | b1983d427a53911ea71ba621d4bf994ae22b1536 (diff) |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
Cross-merge networking fixes after downstream PR.
No conflicts or adjacent changes.
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Diffstat (limited to 'drivers/dma/dw-edma/Makefile')
-rw-r--r-- | drivers/dma/dw-edma/Makefile | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/drivers/dma/dw-edma/Makefile b/drivers/dma/dw-edma/Makefile index 8d45c0d5689d..83ab58f87760 100644 --- a/drivers/dma/dw-edma/Makefile +++ b/drivers/dma/dw-edma/Makefile @@ -1,7 +1,9 @@ # SPDX-License-Identifier: GPL-2.0 obj-$(CONFIG_DW_EDMA) += dw-edma.o -dw-edma-$(CONFIG_DEBUG_FS) := dw-edma-v0-debugfs.o -dw-edma-objs := dw-edma-core.o \ - dw-edma-v0-core.o $(dw-edma-y) +dw-edma-$(CONFIG_DEBUG_FS) := dw-edma-v0-debugfs.o \ + dw-hdma-v0-debugfs.o +dw-edma-objs := dw-edma-core.o \ + dw-edma-v0-core.o \ + dw-hdma-v0-core.o $(dw-edma-y) obj-$(CONFIG_DW_EDMA_PCIE) += dw-edma-pcie.o |