Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c366a2c4 authored by Ilya Lipnitskiy's avatar Ilya Lipnitskiy Committed by Greg Kroah-Hartman
Browse files

staging/mt7621-dma: mtk-hsdma.c->hsdma-mt7621.c 



commit 1f92798cbe7fe923479cff754dd06dd23d352e36 upstream.

Also use KBUILD_MODNAME for module name.

This driver is only used by RALINK MIPS MT7621 SoCs. Tested by building
against that target using OpenWrt with Linux 5.10.10.

Fixes the following error:
error: the following would cause module name conflict:
  drivers/dma/mediatek/mtk-hsdma.ko
  drivers/staging/mt7621-dma/mtk-hsdma.ko

Cc: stable@vger.kernel.org
Cc: Masahiro Yamada <masahiroy@kernel.org>
Signed-off-by: default avatarIlya Lipnitskiy <ilya.lipnitskiy@gmail.com>
Link: https://lore.kernel.org/r/20210130034507.2115280-1-ilya.lipnitskiy@gmail.com


Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 37963344

drivers/staging/mt7621-dma/Makefile

+1 −1
Original line number Original line Diff line number Diff line 
obj-$(CONFIG_DMA_RALINK) += ralink-gdma.o

obj-$(CONFIG_DMA_RALINK) += ralink-gdma.o

obj-$(CONFIG_MTK_HSDMA) += mtk-hsdma.o

obj-$(CONFIG_MTK_HSDMA) += hsdma-mt7621.o





ccflags-y += -I$(srctree)/drivers/dma
 
ccflags-y += -I$(srctree)/drivers/dma

drivers/staging/mt7621-dma/mtk-hsdma.c→drivers/staging/mt7621-dma/hsdma-mt7621.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -760,7 +760,7 @@ static struct platform_driver mtk_hsdma_driver = { 
	.probe = mtk_hsdma_probe,

	.probe = mtk_hsdma_probe,

	.remove = mtk_hsdma_remove,

	.remove = mtk_hsdma_remove,

	.driver = {

	.driver = {

		.name = "hsdma-mt7621",

		.name = KBUILD_MODNAME,

		.of_match_table = mtk_hsdma_of_match,

		.of_match_table = mtk_hsdma_of_match,

	},

	},

};

};