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 'u-boot/master' into 'u-boot-arm/master'
[oweals/u-boot.git]
/
arch
/
arm
/
include
/
asm
/
arch-at91
/
at91_spi.h
diff --git
a/arch/arm/include/asm/arch-at91/at91_spi.h
b/arch/arm/include/asm/arch-at91/at91_spi.h
index f44cf67849c2b221564d994ba839738206dda0b2..b18665b62c8c078368428f02a0970fd4be2606fb 100644
(file)
--- a/
arch/arm/include/asm/arch-at91/at91_spi.h
+++ b/
arch/arm/include/asm/arch-at91/at91_spi.h
@@
-118,6
+118,6
@@
typedef struct at91_spi {
#define AT91_SPI_PTSR 0x0124 /* PDC Transfer Status Register */
-#endif /* CONFIG_AT
91
_LEGACY */
+#endif /* CONFIG_AT
MEL
_LEGACY */
#endif