Skip to content

Commit 55ed51f

Browse files
sudipm-mukherjeegregkh
authored andcommitted
{tty: serial, nand: onenand}: samsung: rename to fix build warning
Any arm config which has 'CONFIG_MTD_ONENAND_SAMSUNG=m' and 'CONFIG_SERIAL_SAMSUNG=m' gives a build warning: warning: same module names found: drivers/tty/serial/samsung.ko drivers/mtd/nand/onenand/samsung.ko Rename both drivers/tty/serial/samsung.c to drivers/tty/serial/samsung_tty.c and drivers/mtd/nand/onenand/samsung.c drivers/mtd/nand/onenand/samsung_mtd.c to fix the warning. Signed-off-by: Sudip Mukherjee <[email protected]> Acked-by: Richard Weinberger <[email protected]> Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Greg Kroah-Hartman <[email protected]>
1 parent 50b2b57 commit 55ed51f

File tree

4 files changed

+2
-2
lines changed

4 files changed

+2
-2
lines changed

drivers/mtd/nand/onenand/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,6 @@ obj-$(CONFIG_MTD_ONENAND) += onenand.o
99
# Board specific.
1010
obj-$(CONFIG_MTD_ONENAND_GENERIC) += generic.o
1111
obj-$(CONFIG_MTD_ONENAND_OMAP2) += omap2.o
12-
obj-$(CONFIG_MTD_ONENAND_SAMSUNG) += samsung.o
12+
obj-$(CONFIG_MTD_ONENAND_SAMSUNG) += samsung_mtd.o
1313

1414
onenand-objs = onenand_base.o onenand_bbt.o

drivers/tty/serial/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ obj-$(CONFIG_SERIAL_PXA_NON8250) += pxa.o
3030
obj-$(CONFIG_SERIAL_PNX8XXX) += pnx8xxx_uart.o
3131
obj-$(CONFIG_SERIAL_SA1100) += sa1100.o
3232
obj-$(CONFIG_SERIAL_BCM63XX) += bcm63xx_uart.o
33-
obj-$(CONFIG_SERIAL_SAMSUNG) += samsung.o
33+
obj-$(CONFIG_SERIAL_SAMSUNG) += samsung_tty.o
3434
obj-$(CONFIG_SERIAL_MAX3100) += max3100.o
3535
obj-$(CONFIG_SERIAL_MAX310X) += max310x.o
3636
obj-$(CONFIG_SERIAL_IP22_ZILOG) += ip22zilog.o
File renamed without changes.

0 commit comments

Comments
 (0)