diff options
| author | Boris Brezillon <boris.brezillon@free-electrons.com> | 2017-09-01 15:34:00 +0200 |
|---|---|---|
| committer | Boris Brezillon <boris.brezillon@free-electrons.com> | 2017-09-01 15:34:00 +0200 |
| commit | a52329a9ce9fa5120eda68ae6af050bc498ab83e (patch) | |
| tree | d59e383e3a39eda95362d4e6a458979c3df3bb95 /drivers/mtd/spi-nor/Makefile | |
| parent | Merge tag 'v4.13-rc7' into mtd/next (diff) | |
| parent | mtd: spi-nor: add support for Microchip sst26vf064b QSPI memory (diff) | |
| download | linux-a52329a9ce9fa5120eda68ae6af050bc498ab83e.tar.xz linux-a52329a9ce9fa5120eda68ae6af050bc498ab83e.zip | |
Merge tag 'spi-nor/for-4.14' of git://git.infradead.org/l2-mtd into mtd/next
From Cyrille:
"
This pull request contains the following notable changes:
- add support to the JEDEC JESD216B specification (SFDP tables).
- add support to the Intel Denverton SPI flash controller.
- fix error recovery for Spansion/Cypress SPI NOR memories.
- fix 4-byte address management for the Aspeed SPI controller.
- add support to some Microchip SST26 memory parts
- remove unneeded pinctrl header
"
Diffstat (limited to 'drivers/mtd/spi-nor/Makefile')
| -rw-r--r-- | drivers/mtd/spi-nor/Makefile | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/mtd/spi-nor/Makefile b/drivers/mtd/spi-nor/Makefile index 285aab86c7ca..7d84c5108e17 100644 --- a/drivers/mtd/spi-nor/Makefile +++ b/drivers/mtd/spi-nor/Makefile @@ -7,5 +7,6 @@ obj-$(CONFIG_SPI_HISI_SFC) += hisi-sfc.o 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_PCI) += intel-spi-pci.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 +obj-$(CONFIG_SPI_STM32_QUADSPI) += stm32-quadspi.o |