diff options
| author | Brian Norris <computersforpeace@gmail.com> | 2017-05-01 17:08:10 -0700 |
|---|---|---|
| committer | Brian Norris <computersforpeace@gmail.com> | 2017-05-01 17:08:10 -0700 |
| commit | 47228ca57e845d3d9196eb4e232b7cf6217a9beb (patch) | |
| tree | 04cbba672067e40eb11537a26e081c6175aaad20 /drivers/mtd/spi-nor/Makefile | |
| parent | 57e363b8c45b6626b012f6ce39a2f70adf6b49fc (diff) | |
| parent | 8abe904dc82772bf1635fcc5765433c672f0a875 (diff) | |
| download | linux-47228ca57e845d3d9196eb4e232b7cf6217a9beb.tar.gz linux-47228ca57e845d3d9196eb4e232b7cf6217a9beb.tar.bz2 linux-47228ca57e845d3d9196eb4e232b7cf6217a9beb.zip | |
Merge tag 'spi-nor/for-4.12-v2' of git://github.com/spi-nor/linux into MTD
From Cyrille:
"""
This pull request contains the following notable changes:
- fixes in the hisi SPI controller driver.
- fixes in the intel SPI controller driver.
- fixes in the Mediatek SPI controller driver.
- fixes to some SPI flash memories not supported the Chip Erase command.
- add support to some new memory parts (Winbond, Macronix, Micron, ESMT).
- add new driver for the STM32 QSPI controller.
"""
Diffstat (limited to 'drivers/mtd/spi-nor/Makefile')
| -rw-r--r-- | drivers/mtd/spi-nor/Makefile | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/mtd/spi-nor/Makefile b/drivers/mtd/spi-nor/Makefile index 72238a793198..285aab86c7ca 100644 --- a/drivers/mtd/spi-nor/Makefile +++ b/drivers/mtd/spi-nor/Makefile @@ -8,3 +8,4 @@ obj-$(CONFIG_MTD_MT81xx_NOR) += mtk-quadspi.o obj-$(CONFIG_SPI_NXP_SPIFI) += nxp-spifi.o obj-$(CONFIG_SPI_INTEL_SPI) += intel-spi.o obj-$(CONFIG_SPI_INTEL_SPI_PLATFORM) += intel-spi-platform.o +obj-$(CONFIG_SPI_STM32_QUADSPI) += stm32-quadspi.o
\ No newline at end of file |