aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLinus Torvalds2020-04-17 11:52:20 -0700
committerLinus Torvalds2020-04-17 11:52:20 -0700
commitceb1adbacb4971cd47533d667f91ed06a38d7d4a (patch)
tree6d609c905fc6e9690d8dc0803507425d19946c8d
parent1634615dc14d258f3c5695338db26d5f115dabc7 (diff)
parent2098c564701c0dde76063dd9c5c00a7a1f173541 (diff)
Merge tag 'mtd/fixes-for-5.7-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux
Pull mtd fix from Richard Weinberger: "spi-nor: fix for missing directory after code refactoring" * tag 'mtd/fixes-for-5.7-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux: mtd: spi-nor: Compile files in controllers/ directory
-rw-r--r--drivers/mtd/spi-nor/Makefile2
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/mtd/spi-nor/Makefile b/drivers/mtd/spi-nor/Makefile
index 7ddb742de1fe..653923896205 100644
--- a/drivers/mtd/spi-nor/Makefile
+++ b/drivers/mtd/spi-nor/Makefile
@@ -18,3 +18,5 @@ spi-nor-objs += winbond.o
spi-nor-objs += xilinx.o
spi-nor-objs += xmc.o
obj-$(CONFIG_MTD_SPI_NOR) += spi-nor.o
+
+obj-$(CONFIG_MTD_SPI_NOR) += controllers/