summaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorTom Rini <trini@konsulko.com>2015-08-18 08:24:32 -0400
committerTom Rini <trini@konsulko.com>2015-08-18 08:24:32 -0400
commit783983f323730540f861413dfbea6802c88afcf8 (patch)
tree7f72555dec8a8ec9d3e45e96864478c1c7bde6d1 /drivers
parent0d339cf9a969f0c249713d3697e735184f1bd955 (diff)
parent14a66afead568a5c3a6bb49782432bea3b397fb8 (diff)
downloadblackbird-obmc-uboot-783983f323730540f861413dfbea6802c88afcf8.tar.gz
blackbird-obmc-uboot-783983f323730540f861413dfbea6802c88afcf8.zip
Merge branch 'master' of git://git.denx.de/u-boot-samsung
Diffstat (limited to 'drivers')
-rw-r--r--drivers/spi/exynos_spi.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/spi/exynos_spi.c b/drivers/spi/exynos_spi.c
index 6d77c319e7..418b48120a 100644
--- a/drivers/spi/exynos_spi.c
+++ b/drivers/spi/exynos_spi.c
@@ -16,7 +16,7 @@
#include <asm/arch/cpu.h>
#include <asm/arch/gpio.h>
#include <asm/arch/pinmux.h>
-#include <asm/arch-exynos/spi.h>
+#include <asm/arch/spi.h>
#include <asm/io.h>
DECLARE_GLOBAL_DATA_PTR;
OpenPOWER on IntegriCloud