diff options
| author | Boris Brezillon | 2018-07-20 00:38:13 +0200 |
|---|---|---|
| committer | Miquel Raynal | 2018-07-31 09:45:53 +0200 |
| commit | d05a9524d7ec513648ad5e0fbd944e6ff3ddbd84 (patch) | |
| tree | 7584ded8890ffb13eed017e98019d841dad74ae7 | |
| parent | mtd: rawnand: add hooks that may be called during nand_scan() (diff) | |
| download | kernel-qcow2-linux-d05a9524d7ec513648ad5e0fbd944e6ff3ddbd84.tar.gz kernel-qcow2-linux-d05a9524d7ec513648ad5e0fbd944e6ff3ddbd84.tar.xz kernel-qcow2-linux-d05a9524d7ec513648ad5e0fbd944e6ff3ddbd84.zip | |
mtd: rawnand: jz4740: Include gpio/consumer.h instead of gpio.h
GPIO consumers should no longer include <linux/gpio.h>, and instead
include <linux/gpio/consumer.h>.
Also, explicitly include <include/io.h> since it seems to be missing
after switching to <linux/gpio/consumer.h>.
This fixes a build error when selecting the driver without selecting
GPIOLIB, which can happen when COMPILE_TEST=y.
Fixes: 6968e07e8169 ("mtd: rawnand: jz4740: Allow selection of this driver when COMPILE_TEST=y")
Reported-by: Miquel Raynal <miquel.raynal@bootlin.com>
Signed-off-by: Boris Brezillon <boris.brezillon@bootlin.com>
Signed-off-by: Miquel Raynal <miquel.raynal@bootlin.com>
| -rw-r--r-- | drivers/mtd/nand/raw/jz4740_nand.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/mtd/nand/raw/jz4740_nand.c b/drivers/mtd/nand/raw/jz4740_nand.c index 9bb8a89e09f9..a4052b03249c 100644 --- a/drivers/mtd/nand/raw/jz4740_nand.c +++ b/drivers/mtd/nand/raw/jz4740_nand.c @@ -13,6 +13,7 @@ * */ +#include <linux/io.h> #include <linux/ioport.h> #include <linux/kernel.h> #include <linux/module.h> @@ -23,7 +24,7 @@ #include <linux/mtd/rawnand.h> #include <linux/mtd/partitions.h> -#include <linux/gpio.h> +#include <linux/gpio/consumer.h> #include <linux/platform_data/jz4740/jz4740_nand.h> |