diff options
| author | Andy Fleming <afleming@freescale.com> | 2008-02-14 10:11:14 -0600 |
|---|---|---|
| committer | Andrew Fleming-AFLEMING <afleming@freescale.com> | 2008-02-14 10:11:14 -0600 |
| commit | 3f2175fa840925e2028c5d482e4cefa787cc8703 (patch) | |
| tree | 37dab4aa866865e647beda2993e710b4f246fb8f /drivers/mtd | |
| parent | d1bcf9e53b41dfa4be6943b739ee82627a0a6d31 (diff) | |
| parent | fe891ecf4d187e9d11dde869ed4623af52b54451 (diff) | |
Merge branch 'denx'
Diffstat (limited to 'drivers/mtd')
| -rw-r--r-- | drivers/mtd/dataflash.c | 2 | ||||
| -rw-r--r-- | drivers/mtd/jedec_flash.c | 4 |
2 files changed, 1 insertions, 5 deletions
diff --git a/drivers/mtd/dataflash.c b/drivers/mtd/dataflash.c index 91903c8c8f..3ebb7064f2 100644 --- a/drivers/mtd/dataflash.c +++ b/drivers/mtd/dataflash.c @@ -304,7 +304,7 @@ AT91PS_DataFlash AT91F_DataflashSelect (AT91PS_DataFlash pFlash, for (i = 0; i < CFG_MAX_DATAFLASH_BANKS; i++) if ( dataflash_info[i].id - && ((((int) addr) & 0xFF000000) == + && ((((int) *addr) & 0xFF000000) == dataflash_info[i].logical_address)) { addr_valid = 1; break; diff --git a/drivers/mtd/jedec_flash.c b/drivers/mtd/jedec_flash.c index 94e87cbf00..41aad3bd6a 100644 --- a/drivers/mtd/jedec_flash.c +++ b/drivers/mtd/jedec_flash.c @@ -218,10 +218,6 @@ static const struct amd_flash_info jedec_table[] = { #endif }; - -#define ARRAY_SIZE(x) (sizeof(x) / sizeof((x)[0])) - - static inline void fill_info(flash_info_t *info, const struct amd_flash_info *jedec_entry, ulong base) { int i,j; |