diff options
| author | Boris Brezillon <boris.brezillon@bootlin.com> | 2018-04-04 23:11:36 +0300 |
|---|---|---|
| committer | Boris Brezillon <boris.brezillon@bootlin.com> | 2018-04-04 23:11:36 +0300 |
| commit | a88b5f38338db9cf2b8868e3645c30da655ac139 (patch) | |
| tree | a3f77c786d0fc68a7f8421947ba3684f4e231a6c /drivers/mtd/sm_ftl.c | |
| parent | 7c0ed565d2a90ba45ea3f895cf625c0091451960 (diff) | |
| parent | 097ccca726ffedb277c104aba45c59d075969e51 (diff) | |
| download | linux-a88b5f38338db9cf2b8868e3645c30da655ac139.tar.xz | |
Merge tag 'nand/for-4.17' of git://git.infradead.org/linux-mtd into mtd/next
Core changes:
* Prepare arrival of the SPI NAND subsystem by implementing a generic
(interface-agnostic) layer to ease manipulation of NAND devices
* Move onenand code base to the drivers/mtd/nand/ dir
* Rework timing mode selection
* Provide a generic way for NAND chip drivers to flag a specific
GET/SET FEATURE operation as supported/unsupported
* Stop embedding ONFI/JEDEC param page in nand_chip
Driver changes:
* Rework/cleanup of the mxc driver
* Various cleanups in the vf610 driver
* Migrate the fsmc and vf610 to ->exec_op()
* Get rid of the pxa driver (replaced by marvell_nand)
* Support ->setup_data_interface() in the GPMI driver
* Fix probe error path in several drivers
* Remove support for unused hw_syndrome mode in sunxi_nand
* Various minor improvements
Diffstat (limited to 'drivers/mtd/sm_ftl.c')
| -rw-r--r-- | drivers/mtd/sm_ftl.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/mtd/sm_ftl.c b/drivers/mtd/sm_ftl.c index 72740ede9f05..79636349df96 100644 --- a/drivers/mtd/sm_ftl.c +++ b/drivers/mtd/sm_ftl.c @@ -17,7 +17,7 @@ #include <linux/bitops.h> #include <linux/slab.h> #include <linux/mtd/nand_ecc.h> -#include "nand/sm_common.h" +#include "nand/raw/sm_common.h" #include "sm_ftl.h" |