mtd: jz4740_nand: fix build on jz4740 after removing gpio.h

[Linux-MTD Mailing List]

Gitweb:     http://git.infradead.org/?p=mtd-2.6.git;a=commit;h=96dd922c198286681fbbc15100e196e0f629e2fb
Commit:     96dd922c198286681fbbc15100e196e0f629e2fb
Parent:     8005c49d9aea74d382f474ce11afbbc7d7130bec
Author:     Brian Norris <computersforpeace at gmail.com>
AuthorDate: Wed Nov 11 15:36:16 2015 -0800
Committer:  Brian Norris <computersforpeace at gmail.com>
CommitDate: Mon Nov 16 10:48:15 2015 -0800

    mtd: jz4740_nand: fix build on jz4740 after removing gpio.h
    
    Fallout from commit 832f5dacfa0b ("MIPS: Remove all the uses of custom gpio.h")
    
    We see errors like this:
    
    drivers/mtd/nand/jz4740_nand.c: In function 'jz_nand_detect_bank':
    drivers/mtd/nand/jz4740_nand.c:340:9: error: 'JZ_GPIO_MEM_CS0' undeclared (first use in this function)
    drivers/mtd/nand/jz4740_nand.c:340:9: note: each undeclared identifier is reported only once for each function it appears in
    drivers/mtd/nand/jz4740_nand.c:359:2: error: implicit declaration of function 'jz_gpio_set_function' [-Werror=implicit-function-declaration]
    drivers/mtd/nand/jz4740_nand.c:359:29: error: 'JZ_GPIO_FUNC_MEM_CS0' undeclared (first use in this function)
    drivers/mtd/nand/jz4740_nand.c:399:29: error: 'JZ_GPIO_FUNC_NONE' undeclared (first use in this function)
    drivers/mtd/nand/jz4740_nand.c: In function 'jz_nand_probe':
    drivers/mtd/nand/jz4740_nand.c:528:13: error: 'JZ_GPIO_MEM_CS0' undeclared (first use in this function)
    drivers/mtd/nand/jz4740_nand.c: In function 'jz_nand_remove':
    drivers/mtd/nand/jz4740_nand.c:555:14: error: 'JZ_GPIO_MEM_CS0' undeclared (first use in this function)
    
    Patched similarly to:
    
    https://patchwork.linux-mips.org/patch/11089/
    
    Fixes: 832f5dacfa0b ("MIPS: Remove all the uses of custom gpio.h")
    Signed-off-by: Brian Norris <computersforpeace at gmail.com>
---
 drivers/mtd/nand/jz4740_nand.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/drivers/mtd/nand/jz4740_nand.c b/drivers/mtd/nand/jz4740_nand.c
index dc4e844..5a99a93 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