diff options
| author | Tom Rini <trini@konsulko.com> | 2018-10-02 13:02:22 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2018-10-02 17:01:46 -0400 |
| commit | 592cd5defd4f71d34ffcbd8dd3326bc10f662e20 (patch) | |
| tree | 0824c4d2c60d79b7be18ba82209d899e4d4f8c34 /arch | |
| parent | 2ba8bf207481cfb319f54a1bef67f6f068831a58 (diff) | |
| parent | b3bec2525604d6b42bb9e7fd719c84b022447db3 (diff) | |
| download | u-boot-592cd5defd4f71d34ffcbd8dd3326bc10f662e20.tar.gz | |
Merge branch 'master' of git://git.denx.de/u-boot-spi
This is the PR for SPI-NAND changes along with few spi changes.
[trini: Re-sync changes for ls1012afrwy_qspi*_defconfig]
Signed-off-by: Tom Rini <trini@konsulko.com>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/mach-uniphier/board_late_init.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-uniphier/board_late_init.c b/arch/arm/mach-uniphier/board_late_init.c index 8ffb9a8d3c..1b871c62ce 100644 --- a/arch/arm/mach-uniphier/board_late_init.c +++ b/arch/arm/mach-uniphier/board_late_init.c @@ -12,7 +12,7 @@ #include <stdio.h> #include <linux/io.h> #include <linux/printk.h> -#include <../drivers/mtd/nand/denali.h> +#include <../drivers/mtd/nand/raw/denali.h> #include "init.h" |