Merge branch 'r-ml-master' into t-master

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

diff --git a/include/asm-microblaze/bitops.h b/include/asm-microblaze/bitops.h
index 5d814f0eb0e9c3f02aac7aed9e02745312c47d2f..e8c835f7c071246ddc707fd5f934e1d43fb80038 100644 (file)
--- a/include/asm-microblaze/bitops.h
+++ b/include/asm-microblaze/bitops.h
@@ -266,8 +266,6 @@ found_middle:
        return result + ffz(tmp);
 }
 
-#define ffs(x) generic_ffs(x)
-
 /*
  * hweightN: returns the hamming weight (i.e. the number
  * of bits set) of a N-bit word