diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2020-04-17 20:52:20 +0200 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2020-04-17 20:52:20 +0200 |
commit | ceb1adbacb4971cd47533d667f91ed06a38d7d4a (patch) | |
tree | 6d609c905fc6e9690d8dc0803507425d19946c8d /drivers | |
parent | Merge tag 'linux-watchdog-5.7-rc2' of git://www.linux-watchdog.org/linux-watc... (diff) | |
parent | mtd: spi-nor: Compile files in controllers/ directory (diff) | |
download | linux-ceb1adbacb4971cd47533d667f91ed06a38d7d4a.tar.xz linux-ceb1adbacb4971cd47533d667f91ed06a38d7d4a.zip |
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
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/mtd/spi-nor/Makefile | 2 |
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/ |