From 386118a896554b13f14ad0f82356276988f7de82 Mon Sep 17 00:00:00 2001 From: Michal Simek Date: Tue, 8 Dec 2009 09:12:49 +0100 Subject: [PATCH] microblaze: Correct ffs regression for Microblaze We are using generic implementation of ffs. This should be part of Simon's commit 0413cfecea350000eab5e591a0965c3e3ee0ff00 Here is warning message which this patch removes. In file included from /tmp/u-boot-microblaze/include/common.h:38, from cmd_mtdparts.c:87: /tmp/u-boot-microblaze/include/linux/bitops.h:123:1: warning: "ffs" redefined In file included from /tmp/u-boot-microblaze/include/linux/bitops.h:110, from /tmp/u-boot-microblaze/include/common.h:38, from cmd_mtdparts.c:87: /tmp/u-boot-microblaze/include/asm/bitops.h:269:1: warning: this is the location of the previous definition Signed-off-by: Michal Simek --- include/asm-microblaze/bitops.h | 2 -- 1 file changed, 2 deletions(-) diff --git a/include/asm-microblaze/bitops.h b/include/asm-microblaze/bitops.h index 5d814f0..e8c835f 100644 --- 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 -- 1.9.1