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 'u-boot-atmel/master' into 'u-boot-arm/master'
[oweals/u-boot.git]
/
include
/
linux
/
mtd
/
nftl-user.h
diff --git
a/include/linux/mtd/nftl-user.h
b/include/linux/mtd/nftl-user.h
index b2bca18e7311bf1670271b3cf5988b0c933278fe..22b8b707e548165b4afeb90228d2feceef697b3b 100644
(file)
--- a/
include/linux/mtd/nftl-user.h
+++ b/
include/linux/mtd/nftl-user.h
@@
-32,8
+32,8
@@
struct nftl_uci1 {
} __attribute__((packed));
struct nftl_uci2 {
} __attribute__((packed));
struct nftl_uci2 {
-
uint16_t FoldMark;
-
uint16_t FoldMark1;
+ uint16_t FoldMark;
+ uint16_t FoldMark1;
uint32_t unused;
} __attribute__((packed));
uint32_t unused;
} __attribute__((packed));