Merge git://git.infradead.org/battery-2.6

[pandora-kernel.git] / lib / find_last_bit.c

diff --git a/lib/find_last_bit.c b/lib/find_last_bit.c
index 5d202e3..d903959 100644 (file)
--- a/lib/find_last_bit.c
+++ b/lib/find_last_bit.c
@@ -15,6 +15,8 @@
 #include <asm/types.h>
 #include <asm/byteorder.h>
 
+#ifndef find_last_bit
+
 unsigned long find_last_bit(const unsigned long *addr, unsigned long size)
 {
        unsigned long words;
@@ -43,3 +45,5 @@ found:
        return size;
 }
 EXPORT_SYMBOL(find_last_bit);
+
+#endif