summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-davinci/board-dm646x-evm.c
diff options
context:
space:
mode:
authorBoris Brezillon2017-08-23 17:00:12 +0200
committerBoris Brezillon2017-08-23 17:00:12 +0200
commita75d6a4cebcc58c4fb139385fc996a62b6f18f68 (patch)
tree86be6c413298b08e159d9f9019d52abd06540809 /arch/arm/mach-davinci/board-dm646x-evm.c
parentmtd: nand: tmio: Register partitions using the parsers (diff)
parentmtd: nand: Rename nand.h into rawnand.h (diff)
downloadkernel-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-davinci/board-dm646x-evm.c')
-rw-r--r--arch/arm/mach-davinci/board-dm646x-evm.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-davinci/board-dm646x-evm.c b/arch/arm/mach-davinci/board-dm646x-evm.c
index 1d76e7480a42..cb0a41e83582 100644
--- a/arch/arm/mach-davinci/board-dm646x-evm.c
+++ b/arch/arm/mach-davinci/board-dm646x-evm.c
@@ -29,7 +29,7 @@
#include <media/i2c/adv7343.h>
#include <linux/mtd/mtd.h>
-#include <linux/mtd/nand.h>
+#include <linux/mtd/rawnand.h>
#include <linux/mtd/partitions.h>
#include <linux/clk.h>
#include <linux/export.h>