diff options
author | Boris Brezillon | 2017-08-23 17:00:12 +0200 |
---|---|---|
committer | Boris Brezillon | 2017-08-23 17:00:12 +0200 |
commit | a75d6a4cebcc58c4fb139385fc996a62b6f18f68 (patch) | |
tree | 86be6c413298b08e159d9f9019d52abd06540809 /arch/arm/mach-orion5x/ts209-setup.c | |
parent | mtd: nand: tmio: Register partitions using the parsers (diff) | |
parent | mtd: nand: Rename nand.h into rawnand.h (diff) | |
download | kernel-qcow2-linux-a75d6a4cebcc58c4fb139385fc996a62b6f18f68.tar.gz kernel-qcow2-linux-a75d6a4cebcc58c4fb139385fc996a62b6f18f68.tar.xz kernel-qcow2-linux-a75d6a4cebcc58c4fb139385fc996a62b6f18f68.zip |
Merge branch 'nand/rename-header-file' of git://git.infradead.org/l2-mtd into nand/next
Diffstat (limited to 'arch/arm/mach-orion5x/ts209-setup.c')
-rw-r--r-- | arch/arm/mach-orion5x/ts209-setup.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-orion5x/ts209-setup.c b/arch/arm/mach-orion5x/ts209-setup.c index 7bd671b2854c..0c315515dd2d 100644 --- a/arch/arm/mach-orion5x/ts209-setup.c +++ b/arch/arm/mach-orion5x/ts209-setup.c @@ -15,7 +15,7 @@ #include <linux/pci.h> #include <linux/irq.h> #include <linux/mtd/physmap.h> -#include <linux/mtd/nand.h> +#include <linux/mtd/rawnand.h> #include <linux/mv643xx_eth.h> #include <linux/gpio_keys.h> #include <linux/input.h> |