diff options
| author | Richard Weinberger <richard@nod.at> | 2017-11-02 22:30:37 +0100 |
|---|---|---|
| committer | Richard Weinberger <richard@nod.at> | 2017-11-02 22:30:37 +0100 |
| commit | 16271224bcf09f7bbc9b00f70df7928a3e75fc89 (patch) | |
| tree | 3edc879f262b6cc89ea07cb203ad687b2fd8d44b /drivers/mtd/nand/denali_dt.c | |
| parent | Merge tag 'spi-nor/for-4.15' of git://git.infradead.org/l2-mtd (diff) | |
| parent | mtd: nand: Fix writing mtdoops to nand flash. (diff) | |
| download | linux-16271224bcf09f7bbc9b00f70df7928a3e75fc89.tar.xz linux-16271224bcf09f7bbc9b00f70df7928a3e75fc89.zip | |
Merge tag 'nand/for-4.15' of git://git.infradead.org/l2-mtd
From Boris:
"
Core changes:
* Add a flag to mark NANDs that require 3 address cycles to encode a
page address
* Set a default ECC/free layout when NAND_ECC_NONE is requested
* Fix a bug in panic_nand_write()
Driver changes:
* Another batch of cleanups for the denali driver
* Fix PM support in the atmel driver
* Remove support for platform data in the omap driver
* Fix subpage write in the omap driver
* Fix irq handling in the mtk driver
* Change link order of mtk_ecc and mtk_nand drivers to speed up boot
time
* Change log level of ECC error messages in the mxc driver
* Patch the pxa3xx driver to support Armada 8k platforms
* Add BAM DMA support to the qcom driver
* Convert gpio-nand to the GPIO desc API
* Fix ECC handling in the mt29f driver
"
Diffstat (limited to 'drivers/mtd/nand/denali_dt.c')
| -rw-r--r-- | drivers/mtd/nand/denali_dt.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/mtd/nand/denali_dt.c b/drivers/mtd/nand/denali_dt.c index 56e2e177644d..cfd33e6ca77f 100644 --- a/drivers/mtd/nand/denali_dt.c +++ b/drivers/mtd/nand/denali_dt.c @@ -12,15 +12,16 @@ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for * more details. */ + #include <linux/clk.h> #include <linux/err.h> #include <linux/io.h> #include <linux/ioport.h> #include <linux/kernel.h> #include <linux/module.h> -#include <linux/platform_device.h> #include <linux/of.h> #include <linux/of_device.h> +#include <linux/platform_device.h> #include "denali.h" @@ -155,7 +156,6 @@ static struct platform_driver denali_dt_driver = { .of_match_table = denali_nand_dt_ids, }, }; - module_platform_driver(denali_dt_driver); MODULE_LICENSE("GPL"); |