diff options
| author | Boris Brezillon <boris.brezillon@bootlin.com> | 2018-07-09 22:09:42 +0200 |
|---|---|---|
| committer | Miquel Raynal <miquel.raynal@bootlin.com> | 2018-07-18 10:10:23 +0200 |
| commit | e65e3a50702f4e7a01c0b36ff08d6ed8dde7ee7b (patch) | |
| tree | 90477ca125764a64df7c1aff806e801868906c10 | |
| parent | eaea2e7300a23e9e40d15ff9b80c7407e3e7802c (diff) | |
| download | linux-stable-e65e3a50702f4e7a01c0b36ff08d6ed8dde7ee7b.tar.gz linux-stable-e65e3a50702f4e7a01c0b36ff08d6ed8dde7ee7b.tar.bz2 linux-stable-e65e3a50702f4e7a01c0b36ff08d6ed8dde7ee7b.zip | |
MIPS: jz4740: Move jz4740_nand.h header to include/linux/platform_data/jz4740
This way we will be able to compile the jz4740_nand driver when
COMPILE_TEST=y.
Signed-off-by: Boris Brezillon <boris.brezillon@bootlin.com>
Acked-by: Paul Burton <paul.burton@mips.com>
Signed-off-by: Miquel Raynal <miquel.raynal@bootlin.com>
| -rw-r--r-- | arch/mips/jz4740/board-qi_lb60.c | 3 | ||||
| -rw-r--r-- | drivers/mtd/nand/raw/jz4740_nand.c | 2 | ||||
| -rw-r--r-- | include/linux/platform_data/jz4740/jz4740_nand.h (renamed from arch/mips/include/asm/mach-jz4740/jz4740_nand.h) | 4 |
3 files changed, 5 insertions, 4 deletions
diff --git a/arch/mips/jz4740/board-qi_lb60.c b/arch/mips/jz4740/board-qi_lb60.c index 60f0767507c6..af0c8ace0141 100644 --- a/arch/mips/jz4740/board-qi_lb60.c +++ b/arch/mips/jz4740/board-qi_lb60.c @@ -29,10 +29,11 @@ #include <linux/power/gpio-charger.h> #include <linux/pwm.h> +#include <linux/platform_data/jz4740/jz4740_nand.h> + #include <asm/mach-jz4740/gpio.h> #include <asm/mach-jz4740/jz4740_fb.h> #include <asm/mach-jz4740/jz4740_mmc.h> -#include <asm/mach-jz4740/jz4740_nand.h> #include <linux/regulator/fixed.h> #include <linux/regulator/machine.h> diff --git a/drivers/mtd/nand/raw/jz4740_nand.c b/drivers/mtd/nand/raw/jz4740_nand.c index 613b00a9604b..a0254461812d 100644 --- a/drivers/mtd/nand/raw/jz4740_nand.c +++ b/drivers/mtd/nand/raw/jz4740_nand.c @@ -25,7 +25,7 @@ #include <linux/gpio.h> -#include <asm/mach-jz4740/jz4740_nand.h> +#include <linux/platform_data/jz4740/jz4740_nand.h> #define JZ_REG_NAND_CTRL 0x50 #define JZ_REG_NAND_ECC_CTRL 0x100 diff --git a/arch/mips/include/asm/mach-jz4740/jz4740_nand.h b/include/linux/platform_data/jz4740/jz4740_nand.h index f381d465e768..bc571f6d5ced 100644 --- a/arch/mips/include/asm/mach-jz4740/jz4740_nand.h +++ b/include/linux/platform_data/jz4740/jz4740_nand.h @@ -13,8 +13,8 @@ * */ -#ifndef __ASM_MACH_JZ4740_JZ4740_NAND_H__ -#define __ASM_MACH_JZ4740_JZ4740_NAND_H__ +#ifndef __JZ4740_NAND_H__ +#define __JZ4740_NAND_H__ #include <linux/mtd/rawnand.h> #include <linux/mtd/partitions.h> |