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>
2015-11-16 14:45:15 -08:00
parent 617f41836c 9ca641b0f0
commit e727ee86d9
2 changed files with 2 additions and 1 deletions
--- 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
--- 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 */