diff options
| author | Brian Norris <computersforpeace@gmail.com> | 2015-11-16 14:45:15 -0800 |
|---|---|---|
| committer | Brian Norris <computersforpeace@gmail.com> | 2015-11-16 14:46:13 -0800 |
| commit | e727ee86d9e51c4f3fd166c1540d23f211e7f37a (patch) | |
| tree | f99639da08a4f305664cc25266f1cdc440fd7a02 | |
| parent | 617f41836c17688141e1c66f4156c2084f8ca86d (diff) | |
| parent | 9ca641b0f02a3a1eedbc8c296e695326da9bbaf9 (diff) | |
Merge MTD 4.4 development into MTD -next
We need to be able to build the jz4740_nand driver.
Signed-off-by: Brian Norris <computersforpeace@gmail.com>
| -rw-r--r-- | drivers/mtd/nand/jz4740_nand.c | 1 | ||||
| -rw-r--r-- | drivers/mtd/nand/nand_base.c | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/drivers/mtd/nand/jz4740_nand.c b/drivers/mtd/nand/jz4740_nand.c index dc4e8446f1ff..5a99a93ed025 100644 --- a/drivers/mtd/nand/jz4740_nand.c +++ b/drivers/mtd/nand/jz4740_nand.c @@ -25,6 +25,7 @@ #include <linux/gpio.h> +#include <asm/mach-jz4740/gpio.h> #include <asm/mach-jz4740/jz4740_nand.h> #define JZ_REG_NAND_CTRL 0x50 diff --git a/drivers/mtd/nand/nand_base.c b/drivers/mtd/nand/nand_base.c index 4ac4efe65c62..0748a13fc2be 100644 --- a/drivers/mtd/nand/nand_base.c +++ b/drivers/mtd/nand/nand_base.c @@ -3110,7 +3110,7 @@ static void nand_resume(struct mtd_info *mtd) */ static void nand_shutdown(struct mtd_info *mtd) { - nand_get_device(mtd, FL_SHUTDOWN); + nand_get_device(mtd, FL_PM_SUSPENDED); } /* Set default functions */ |