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/mtk-quadspi.c | |
| parent | 5ffa70b2a38befadb920b85fe87f5da2b4cff623 (diff) | |
| parent | 18f7ce2f449504c31a2f2caaeb65430812dc3c43 (diff) | |
| download | linux-a52329a9ce9fa5120eda68ae6af050bc498ab83e.tar.bz2 | |
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/mtk-quadspi.c')
| -rw-r--r-- | drivers/mtd/spi-nor/mtk-quadspi.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/mtd/spi-nor/mtk-quadspi.c b/drivers/mtd/spi-nor/mtk-quadspi.c index 8a20ec4991c8..c258c7adf1c5 100644 --- a/drivers/mtd/spi-nor/mtk-quadspi.c +++ b/drivers/mtd/spi-nor/mtk-quadspi.c @@ -24,7 +24,6 @@ #include <linux/mutex.h> #include <linux/of.h> #include <linux/of_device.h> -#include <linux/pinctrl/consumer.h> #include <linux/platform_device.h> #include <linux/slab.h> #include <linux/mtd/mtd.h> |