Eric Lee / smarc-uboot | Embedian Git Server

Commit 386118a896554b13f14ad0f82356276988f7de82

Authored by Michal Simek 2009-12-08 16:12:49 +0800

Exists in master and in 54 other branches

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 <monstr@monstr.eu>

Showing 1 changed file with 0 additions and 2 deletions Side-by-side Diff

include/asm-microblaze/bitops.h

include/asm-microblaze/bitops.h

Diff comments View file @ 386118a

...	...	@@ -266,8 +266,6 @@
266	266	return result + ffz(tmp);
267	267	}
268	268
269		-#define ffs(x) generic_ffs(x)
270		-
271	269	/*
272	270	* hweightN: returns the hamming weight (i.e. the number
273	271	* of bits set) of a N-bit word