From 0c478d4f5473aabada2e4f738739d42a1a13a2eb Mon Sep 17 00:00:00 2001
From: Akinobu Mita <akinobu.mita@gmail.com>
Date: Wed, 29 Sep 2010 18:08:51 +0900
Subject: [PATCH] --- yaml --- r: 212991 b: refs/heads/master c:
 d852a6afd91fc928128f59ebff381838c365e358 h: refs/heads/master i:   212989:
 9ca6980638d6faf593914a18bb4f7c8a868200c1   212987:
 6cf3126812a1e0eac7ec2bba10ece32fdadfcc9b   212983:
 8d2beff6ccadba62ec15466ab287282ee8a8183a   212975:
 7652ec5a4b3cd1684ace744e8e92a0c3566e3aae   212959:
 2bc7eb96aff363255ee14897ee6b644fe111378f   212927:
 fc2bcae10a7b85db79ce8d4642de798c7f1d1733   212863:
 b277bf504bfe0c2b0dd3d764f8d3af413fd4eebb   212735:
 2a49a0350bff4f52c683dd55aede41a3843159e5   212479:
 493f017ed3e1b0029d32a37dbad4046f8e6ee297   211967:
 16b897001e75feaa21e429be70f632cab302aa4a   210943:
 a9c5b849dc3a01cb102c8f659d5617d2ac5b8508   208895:
 b84e94ade56ddd4edbdd07cdf14a6a78a875719b   204799:
 77a3bfc9b2bd0f8e7306833c600a4ee3673b44dc   196607:
 01bac5e5a8414a3908aa50d1e83fbc56ad7584c3 v: v3

---
 [refs]                                  |  2 +-
 trunk/include/asm-generic/bitops/find.h | 14 ++++++++++++--
 trunk/include/linux/bitops.h            | 23 -----------------------
 3 files changed, 13 insertions(+), 26 deletions(-)

diff --git a/[refs] b/[refs]
index 5375e9e94081..92907f6f7431 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 708ff2a0097b02d32d375b66996661f36cd4d6d1
+refs/heads/master: d852a6afd91fc928128f59ebff381838c365e358
diff --git a/trunk/include/asm-generic/bitops/find.h b/trunk/include/asm-generic/bitops/find.h
index 30afec0db7d7..110fa700f853 100644
--- a/trunk/include/asm-generic/bitops/find.h
+++ b/trunk/include/asm-generic/bitops/find.h
@@ -1,13 +1,23 @@
 #ifndef _ASM_GENERIC_BITOPS_FIND_H_
 #define _ASM_GENERIC_BITOPS_FIND_H_
 
-#ifndef CONFIG_GENERIC_FIND_NEXT_BIT
+/**
+ * find_next_bit - find the next set bit in a memory region
+ * @addr: The address to base the search on
+ * @offset: The bitnumber to start searching at
+ * @size: The bitmap size in bits
+ */
 extern unsigned long find_next_bit(const unsigned long *addr, unsigned long
 		size, unsigned long offset);
 
+/**
+ * find_next_zero_bit - find the next cleared bit in a memory region
+ * @addr: The address to base the search on
+ * @offset: The bitnumber to start searching at
+ * @size: The bitmap size in bits
+ */
 extern unsigned long find_next_zero_bit(const unsigned long *addr, unsigned
 		long size, unsigned long offset);
-#endif
 
 #ifdef CONFIG_GENERIC_FIND_FIRST_BIT
 
diff --git a/trunk/include/linux/bitops.h b/trunk/include/linux/bitops.h
index adb0f113f571..827cc95711ef 100644
--- a/trunk/include/linux/bitops.h
+++ b/trunk/include/linux/bitops.h
@@ -149,28 +149,5 @@ extern unsigned long find_last_bit(const unsigned long *addr,
 				   unsigned long size);
 #endif /* CONFIG_GENERIC_FIND_LAST_BIT */
 
-#ifdef CONFIG_GENERIC_FIND_NEXT_BIT
-
-/**
- * find_next_bit - find the next set bit in a memory region
- * @addr: The address to base the search on
- * @offset: The bitnumber to start searching at
- * @size: The bitmap size in bits
- */
-extern unsigned long find_next_bit(const unsigned long *addr,
-				   unsigned long size, unsigned long offset);
-
-/**
- * find_next_zero_bit - find the next cleared bit in a memory region
- * @addr: The address to base the search on
- * @offset: The bitnumber to start searching at
- * @size: The bitmap size in bits
- */
-
-extern unsigned long find_next_zero_bit(const unsigned long *addr,
-					unsigned long size,
-					unsigned long offset);
-
-#endif /* CONFIG_GENERIC_FIND_NEXT_BIT */
 #endif /* __KERNEL__ */
 #endif