aboutsummaryrefslogtreecommitdiffstats
path: root/arch/sh
diff options
context:
space:
mode:
authorBoris Brezillon <boris.brezillon@free-electrons.com>2017-08-23 17:00:12 +0200
committerBoris Brezillon <boris.brezillon@free-electrons.com>2017-08-23 17:00:12 +0200
commita75d6a4cebcc58c4fb139385fc996a62b6f18f68 (patch)
tree86be6c413298b08e159d9f9019d52abd06540809 /arch/sh
parent311bba10cb0e232f2f9b0bace8bec873d7dc32a7 (diff)
parentd4092d76a4a4e57b65910899948a83cc8646c5a5 (diff)
downloadkernel_replicant_linux-a75d6a4cebcc58c4fb139385fc996a62b6f18f68.tar.gz
kernel_replicant_linux-a75d6a4cebcc58c4fb139385fc996a62b6f18f68.tar.bz2
kernel_replicant_linux-a75d6a4cebcc58c4fb139385fc996a62b6f18f68.zip
Merge branch 'nand/rename-header-file' of git://git.infradead.org/l2-mtd into nand/next
Diffstat (limited to 'arch/sh')
-rw-r--r--arch/sh/boards/mach-migor/setup.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/sh/boards/mach-migor/setup.c b/arch/sh/boards/mach-migor/setup.c
index 5de60a77eaa1..0bcbe58b11e9 100644
--- a/arch/sh/boards/mach-migor/setup.c
+++ b/arch/sh/boards/mach-migor/setup.c
@@ -15,7 +15,7 @@
#include <linux/mmc/host.h>
#include <linux/mtd/physmap.h>
#include <linux/mfd/tmio.h>
-#include <linux/mtd/nand.h>
+#include <linux/mtd/rawnand.h>
#include <linux/i2c.h>
#include <linux/regulator/fixed.h>
#include <linux/regulator/machine.h>