diff options
author | Wolfgang Denk <wd@denx.de> | 2011-04-13 22:04:11 +0200 |
---|---|---|
committer | Wolfgang Denk <wd@denx.de> | 2011-04-13 22:04:11 +0200 |
commit | f16b608ae7d0c4611d3a41d2570616a498e64d4c (patch) | |
tree | 213c9f261e590c22f21683a619d997a895ada35b /include | |
parent | 107b56bdd8e82b07458df11f8df4a01067512281 (diff) | |
parent | 1c091f59a03af9f2e821cb054fd555a2748dd091 (diff) | |
download | u-boot-imx-f16b608ae7d0c4611d3a41d2570616a498e64d4c.zip u-boot-imx-f16b608ae7d0c4611d3a41d2570616a498e64d4c.tar.gz u-boot-imx-f16b608ae7d0c4611d3a41d2570616a498e64d4c.tar.bz2 |
Merge branch 'sf' of git://git.denx.de/u-boot-blackfin
Diffstat (limited to 'include')
-rw-r--r-- | include/spi_flash.h | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/include/spi_flash.h b/include/spi_flash.h index 1f8ba29..a384071 100644 --- a/include/spi_flash.h +++ b/include/spi_flash.h @@ -26,11 +26,6 @@ #include <spi.h> #include <linux/types.h> -struct spi_flash_region { - unsigned int count; - unsigned int size; -}; - struct spi_flash { struct spi_slave *spi; @@ -38,6 +33,8 @@ struct spi_flash { u32 size; + u32 sector_size; + int (*read)(struct spi_flash *flash, u32 offset, size_t len, void *buf); int (*write)(struct spi_flash *flash, u32 offset, |