diff options
| author | Tom Rini <trini@konsulko.com> | 2017-12-04 10:24:35 -0500 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2017-12-04 10:24:35 -0500 |
| commit | 0c4d24823ed28c94dae56a10a66687c69b70c1d1 (patch) | |
| tree | 0ac63ef5788ed22b7864e9397f8379c38b2db4db /arch/arm | |
| parent | da63df97ea100053ea34cc022a1660f760ec32b4 (diff) | |
| parent | 0faef2eba946a95f9c78d2b3db47e15bac04b52e (diff) | |
Merge git://git.denx.de/u-boot-uniphier
Diffstat (limited to 'arch/arm')
| -rw-r--r-- | arch/arm/include/asm/ti-common/davinci_nand.h | 2 | ||||
| -rw-r--r-- | arch/arm/mach-omap2/omap3/spl_id_nand.c | 2 | ||||
| -rw-r--r-- | arch/arm/mach-uniphier/board_init.c | 7 |
3 files changed, 4 insertions, 7 deletions
diff --git a/arch/arm/include/asm/ti-common/davinci_nand.h b/arch/arm/include/asm/ti-common/davinci_nand.h index f343ac2c0f..e26381c7fd 100644 --- a/arch/arm/include/asm/ti-common/davinci_nand.h +++ b/arch/arm/include/asm/ti-common/davinci_nand.h @@ -9,7 +9,7 @@ #ifndef _DAVINCI_NAND_H_ #define _DAVINCI_NAND_H_ -#include <linux/mtd/nand.h> +#include <linux/mtd/rawnand.h> #include <asm/arch/hardware.h> #define NAND_READ_START 0x00 diff --git a/arch/arm/mach-omap2/omap3/spl_id_nand.c b/arch/arm/mach-omap2/omap3/spl_id_nand.c index 0e2f0a2f6d..5c9549c743 100644 --- a/arch/arm/mach-omap2/omap3/spl_id_nand.c +++ b/arch/arm/mach-omap2/omap3/spl_id_nand.c @@ -14,7 +14,7 @@ #include <common.h> #include <jffs2/load_kernel.h> -#include <linux/mtd/nand.h> +#include <linux/mtd/rawnand.h> #include <linux/mtd/omap_gpmc.h> #include <asm/io.h> #include <asm/arch/sys_proto.h> diff --git a/arch/arm/mach-uniphier/board_init.c b/arch/arm/mach-uniphier/board_init.c index 121b78605f..8418902a5a 100644 --- a/arch/arm/mach-uniphier/board_init.c +++ b/arch/arm/mach-uniphier/board_init.c @@ -6,17 +6,14 @@ * SPDX-License-Identifier: GPL-2.0+ */ -#include <common.h> -#include <libfdt.h> +#include <linux/errno.h> #include <linux/io.h> +#include <linux/printk.h> #include "init.h" #include "micro-support-card.h" -#include "sg-regs.h" #include "soc-info.h" -DECLARE_GLOBAL_DATA_PTR; - #ifdef CONFIG_ARCH_UNIPHIER_LD20 static void uniphier_ld20_misc_init(void) { |