From: Charles Manning <cdhmanning@gmail.com>
Date: Fri, 7 Jan 2011 01:19:08 +0000 (+1300)
Subject: Merge branch 'mainlining'
X-Git-Tag: linux-mainline-patchset-4~5^2~5
X-Git-Url: https://yaffs.net/gitweb/?p=yaffs2.git;a=commitdiff_plain;h=2823629db2a6035df16d464a95ea5c183a8de484;hp=6a1296f4458cb8eff1535a8618f45379655e5aa5

Merge branch 'mainlining'
---

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.