Correct ffs/fls regression for PowerPC etc

[u-boot] / include / asm-blackfin / bitops.h

diff --git a/include/asm-blackfin/bitops.h b/include/asm-blackfin/bitops.h
index cc3685d35d7bd2d09b6b75b24b44dbe56850e983..ab1fea55c87f0d603f1b957a7ac48952d7c1c590 100644 (file)
--- a/include/asm-blackfin/bitops.h
+++ b/include/asm-blackfin/bitops.h
@@ -79,7 +79,7 @@ static __inline__ void __set_bit(int nr, volatile void *addr)
        mask = 1 << (nr & 0x1f);
        *a |= mask;
 }
-#define __set_bit
+#define PLATFORM__SET_BIT
 
 /*
  * clear_bit() doesn't provide any barrier for the compiler.
@@ -269,14 +269,6 @@ static __inline__ int find_next_zero_bit(void *addr, int size, int offset)
        return result + ffz(tmp);
 }
 
-/*
- * ffs: find first bit set. This is defined the same way as
- * the libc and compiler builtin ffs routines, therefore
- * differs in spirit from the above ffz (man ffs).
- */
-
-#define ffs(x)         generic_ffs(x)
-
 /*
  * hweightN: returns the hamming weight (i.e. the number
  * of bits set) of a N-bit word