diff options
| author | Charles Manning <cdhmanning@gmail.com> | 2011-01-07 14:19:08 +1300 |
|---|---|---|
| committer | Charles Manning <cdhmanning@gmail.com> | 2011-01-07 14:19:08 +1300 |
| commit | 2823629db2a6035df16d464a95ea5c183a8de484 (patch) | |
| tree | d181f7b94a4179c6c84e8b5fe7c526579f218cef | |
| parent | 6a1296f4458cb8eff1535a8618f45379655e5aa5 (diff) | |
| parent | 66cf3cb88e161702e6bb8e1a98a79fc0c9e564d5 (diff) | |
Merge branch 'mainlining'
| -rw-r--r-- | yaffs_mtdif1_multi.c | 2 | ||||
| -rw-r--r-- | yaffs_mtdif1_single.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/yaffs_mtdif1_multi.c b/yaffs_mtdif1_multi.c index 603dc97..cf9c54c 100644 --- a/yaffs_mtdif1_multi.c +++ b/yaffs_mtdif1_multi.c @@ -238,7 +238,7 @@ int nandmtd1_read_chunk_tags(struct yaffs_dev *dev, deleted = !pt1.deleted; pt1.deleted = 1; #else - deleted = (yaffs_count_bits(((u8 *) & pt1)[8]) < 7); + deleted = (hweight8(((u8 *) & pt1)[8]) < 7); #endif /* Check the packed tags mini-ECC and correct if necessary/possible. diff --git a/yaffs_mtdif1_single.c b/yaffs_mtdif1_single.c index 5108369..740f7f6 100644 --- a/yaffs_mtdif1_single.c +++ b/yaffs_mtdif1_single.c @@ -207,7 +207,7 @@ int nandmtd1_read_chunk_tags(struct yaffs_dev *dev, deleted = !pt1.deleted; pt1.deleted = 1; #else - deleted = (yaffs_count_bits(((u8 *) & pt1)[8]) < 7); + deleted = (hweight8(((u8 *) & pt1)[8]) < 7); #endif /* Check the packed tags mini-ECC and correct if necessary/possible. |