[PATCH 06/10][SRU][OEM-5.6] mtd: spi-nor: Compile files in controllers/ directory

AceLan Kao acelan.kao at canonical.com
Wed Nov 18 06:24:45 UTC 2020


From: Guenter Roeck <linux at roeck-us.net>

BugLink: https://bugs.launchpad.net/bugs/1904521

Commit a0900d0195d2 ("mtd: spi-nor: Prepare core / manufacturer code
split") moved various files into a new directory, but did not add the new
directory to its parent directory Makefile. The moved files no longer
build, and affected flash chips no longer instantiate.

Adding the new directory to the parent directory Makefile fixes the
problem.

Fixes: a0900d0195d2 ("mtd: spi-nor: Prepare core / manufacturer code split")
Cc: Boris Brezillon <bbrezillon at kernel.org>
Cc: Tudor Ambarus <tudor.ambarus at microchip.com>
Signed-off-by: Guenter Roeck <linux at roeck-us.net>
Reviewed-by: Boris Brezillon <boris.brezillon at collabora.com>
Acked-by: Joel Stanley <joel at jms.id.au>
Reviewed-by: Tudor Ambarus <tudor.ambarus at microchip.com>
Signed-off-by: Richard Weinberger <richard at nod.at>
(cherry picked from commit 2098c564701c0dde76063dd9c5c00a7a1f173541)
Signed-off-by: AceLan Kao <acelan.kao at canonical.com>
---
 drivers/mtd/spi-nor/Makefile | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/drivers/mtd/spi-nor/Makefile b/drivers/mtd/spi-nor/Makefile
index d6fc70ab4a32..e4d3ddd4e207 100644
--- a/drivers/mtd/spi-nor/Makefile
+++ b/drivers/mtd/spi-nor/Makefile
@@ -2,3 +2,5 @@
 
 spi-nor-objs			:= core.o
 obj-$(CONFIG_MTD_SPI_NOR)	+= spi-nor.o
+
+obj-$(CONFIG_MTD_SPI_NOR)	+= controllers/
-- 
2.25.1




More information about the kernel-team mailing list