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 'master' of git://www.denx.de/git/u-boot-mips
[oweals/u-boot.git]
/
include
/
asm-ppc
/
mpc8xxx_spi.h
diff --git
a/include/asm-ppc/mpc8xxx_spi.h
b/include/asm-ppc/mpc8xxx_spi.h
index 38f12b90cb25eb343dfe66651a5d95f03f65fc41..48b15e4f33b337d17415732f42d88c8febc32986 100644
(file)
--- a/
include/asm-ppc/mpc8xxx_spi.h
+++ b/
include/asm-ppc/mpc8xxx_spi.h
@@
-32,8
+32,7
@@
defined(CONFIG_MPC8315) || \
defined(CONFIG_MPC837X)
defined(CONFIG_MPC8315) || \
defined(CONFIG_MPC837X)
-typedef struct spi8xxx
-{
+typedef struct spi8xxx {
u8 res0[0x20]; /* 0x0-0x01f reserved */
u32 mode; /* mode register */
u32 event; /* event register */
u8 res0[0x20]; /* 0x0-0x01f reserved */
u32 mode; /* mode register */
u32 event; /* event register */
@@
-41,7
+40,7
@@
typedef struct spi8xxx
u32 com; /* command register */
u32 tx; /* transmit register */
u32 rx; /* receive register */
u32 com; /* command register */
u32 tx; /* transmit register */
u32 rx; /* receive register */
- u8 res1[0x
C8]; /* fill up to 0x1
00 */
+ u8 res1[0x
FC8]; /* fill up to 0x10
00 */
} spi8xxx_t;
#endif
} spi8xxx_t;
#endif