projects
/
oweals
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'rmobile' of git://git.denx.de/u-boot-sh
[oweals/u-boot.git]
/
drivers
/
spi
/
mxs_spi.c
diff --git
a/drivers/spi/mxs_spi.c
b/drivers/spi/mxs_spi.c
index 2b9f395a97821568dc12c5e28feaaf42b42ffd50..790db78a02ef470e960cbe1494e4e60bca9cd095 100644
(file)
--- a/
drivers/spi/mxs_spi.c
+++ b/
drivers/spi/mxs_spi.c
@@
-12,13
+12,14
@@
#include <common.h>
#include <malloc.h>
#include <common.h>
#include <malloc.h>
+#include <memalign.h>
#include <spi.h>
#include <spi.h>
-#include <
asm
/errno.h>
+#include <
linux
/errno.h>
#include <asm/io.h>
#include <asm/arch/clock.h>
#include <asm/arch/imx-regs.h>
#include <asm/arch/sys_proto.h>
#include <asm/io.h>
#include <asm/arch/clock.h>
#include <asm/arch/imx-regs.h>
#include <asm/arch/sys_proto.h>
-#include <asm/
imx-common
/dma.h>
+#include <asm/
mach-imx
/dma.h>
#define MXS_SPI_MAX_TIMEOUT 1000000
#define MXS_SPI_PORT_OFFSET 0x2000
#define MXS_SPI_MAX_TIMEOUT 1000000
#define MXS_SPI_PORT_OFFSET 0x2000