diff options
author | Stefano Babic <sbabic@denx.de> | 2015-10-30 14:52:51 +0100 |
---|---|---|
committer | Stefano Babic <sbabic@denx.de> | 2015-10-30 14:52:51 +0100 |
commit | e573bdb324c78fac56655a493bea843842c9d9f8 (patch) | |
tree | 3933d354a6be71cbe66d583fec3f5b2479e596ee /include/mtd | |
parent | a69fdc7787bfa2f27eed74c2ee58c28ce932d502 (diff) | |
parent | 0eb4cf9c14315e1976a116de75da6f420ac0e8dd (diff) | |
download | u-boot-imx-e573bdb324c78fac56655a493bea843842c9d9f8.zip u-boot-imx-e573bdb324c78fac56655a493bea843842c9d9f8.tar.gz u-boot-imx-e573bdb324c78fac56655a493bea843842c9d9f8.tar.bz2 |
Merge branch 'master' of git://git.denx.de/u-boot
Diffstat (limited to 'include/mtd')
-rw-r--r-- | include/mtd/cfi_flash.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/include/mtd/cfi_flash.h b/include/mtd/cfi_flash.h index 048b477..52572b9 100644 --- a/include/mtd/cfi_flash.h +++ b/include/mtd/cfi_flash.h @@ -105,10 +105,10 @@ #define NUM_ERASE_REGIONS 4 /* max. number of erase regions */ typedef union { - unsigned char c; - unsigned short w; - unsigned long l; - unsigned long long ll; + u8 w8; + u16 w16; + u32 w32; + u64 w64; } cfiword_t; /* CFI standard query structure */ |