git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge commit 'v3.0' into x86/vdso
[pandora-kernel.git]
/
include
/
linux
/
bitops.h
diff --git
a/include/linux/bitops.h
b/include/linux/bitops.h
index
2184c6b
..
a3ef66a
100644
(file)
--- a/
include/linux/bitops.h
+++ b/
include/linux/bitops.h
@@
-148,7
+148,7
@@
static inline unsigned long __ffs64(u64 word)
#ifdef __KERNEL__
#ifdef __KERNEL__
-#if
def CONFIG_GENERIC_FIND_LAST_BIT
+#if
ndef find_last_bit
/**
* find_last_bit - find the last set bit in a memory region
* @addr: The address to start the search at
/**
* find_last_bit - find the last set bit in a memory region
* @addr: The address to start the search at
@@
-158,7
+158,7
@@
static inline unsigned long __ffs64(u64 word)
*/
extern unsigned long find_last_bit(const unsigned long *addr,
unsigned long size);
*/
extern unsigned long find_last_bit(const unsigned long *addr,
unsigned long size);
-#endif
/* CONFIG_GENERIC_FIND_LAST_BIT */
+#endif
#endif /* __KERNEL__ */
#endif
#endif /* __KERNEL__ */
#endif