From 446b6dc8d87482af53fa30d29780a78bbae1e9b8 Mon Sep 17 00:00:00 2001 From: Miquel Raynal Date: Mon, 30 Dec 2019 18:31:02 +0100 Subject: [PATCH] mtd: onenand: Use a better name for samsung driver Commit 55ed51fff224 ("{tty: serial, nand: onenand}: samsung: rename to fix build warning") has changed the samsung.c driver to be samsung_mtd.c in order to avoid a conflict in module names with the tty driver. Since the *_mtd suffix is very undescriptive, rename it to onenand_samsung.c, following the folder's convention. Same will be applied to the omap2 onenand driver. Signed-off-by: Miquel Raynal --- drivers/mtd/nand/onenand/Makefile | 2 +- drivers/mtd/nand/onenand/{samsung_mtd.c => onenand_samsung.c} | 0 2 files changed, 1 insertion(+), 1 deletion(-) rename drivers/mtd/nand/onenand/{samsung_mtd.c => onenand_samsung.c} (100%) diff --git a/drivers/mtd/nand/onenand/Makefile b/drivers/mtd/nand/onenand/Makefile index a27b635..0f2f460 100644 --- a/drivers/mtd/nand/onenand/Makefile +++ b/drivers/mtd/nand/onenand/Makefile @@ -9,6 +9,6 @@ obj-$(CONFIG_MTD_ONENAND) += onenand.o # Board specific. obj-$(CONFIG_MTD_ONENAND_GENERIC) += generic.o obj-$(CONFIG_MTD_ONENAND_OMAP2) += omap2.o -obj-$(CONFIG_MTD_ONENAND_SAMSUNG) += samsung_mtd.o +obj-$(CONFIG_MTD_ONENAND_SAMSUNG) += onenand_samsung.o onenand-objs = onenand_base.o onenand_bbt.o diff --git a/drivers/mtd/nand/onenand/samsung_mtd.c b/drivers/mtd/nand/onenand/onenand_samsung.c similarity index 100% rename from drivers/mtd/nand/onenand/samsung_mtd.c rename to drivers/mtd/nand/onenand/onenand_samsung.c -- 2.7.4