From c83688de0ab6af15b702d5340c30a3b2c969c75e Mon Sep 17 00:00:00 2001
From: Akinobu Mita <akinobu.mita@gmail.com>
Date: Fri, 23 Mar 2012 15:02:04 -0700
Subject: [PATCH] --- yaml --- r: 295174 b: refs/heads/master c:
 0a329d2d5a1dd75273597538cdc33512ee38855e h: refs/heads/master v: v3

---
 [refs]                                   | 2 +-
 trunk/drivers/base/regmap/regcache-lzo.c | 2 +-
 trunk/include/linux/bitops.h             | 3 ---
 3 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index 8ca7f7cf1bea..9c41126ae983 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 307b1cd7ecd7f3dc5ce3d3860957f034f0abe4df
+refs/heads/master: 0a329d2d5a1dd75273597538cdc33512ee38855e
diff --git a/trunk/drivers/base/regmap/regcache-lzo.c b/trunk/drivers/base/regmap/regcache-lzo.c
index 8d0061569326..77dc53272289 100644
--- a/trunk/drivers/base/regmap/regcache-lzo.c
+++ b/trunk/drivers/base/regmap/regcache-lzo.c
@@ -341,7 +341,7 @@ static int regcache_lzo_sync(struct regmap *map, unsigned int min,
 
 	lzo_blocks = map->cache;
 	i = min;
-	for_each_set_bit_cont(i, lzo_blocks[0]->sync_bmp,
+	for_each_set_bit_from(i, lzo_blocks[0]->sync_bmp,
 			      lzo_blocks[0]->sync_bmp_nbits) {
 		if (i > max)
 			continue;
diff --git a/trunk/include/linux/bitops.h b/trunk/include/linux/bitops.h
index a78e358f0c17..348b1dca477a 100644
--- a/trunk/include/linux/bitops.h
+++ b/trunk/include/linux/bitops.h
@@ -32,9 +32,6 @@ extern unsigned long __sw_hweight64(__u64 w);
 	     (bit) < (size);					\
 	     (bit) = find_next_bit((addr), (size), (bit) + 1))
 
-#define for_each_set_bit_cont(bit, addr, size) \
-	for_each_set_bit_from(bit, addr, size)
-
 static __inline__ int get_bitmask_order(unsigned int count)
 {
 	int order;