summaryrefslogtreecommitdiff
path: root/include/asm-microblaze
diff options
context:
space:
mode:
authorMichal Simek <monstr@monstr.eu>2009-12-08 09:12:49 +0100
committerMichal Simek <monstr@monstr.eu>2009-12-08 09:19:01 +0100
commit386118a896554b13f14ad0f82356276988f7de82 (patch)
tree5e963d967c129a53d5777457fcc1e3363e71f9be /include/asm-microblaze
parent8fe7b29f9811322931f0192a56431edcf819d6b9 (diff)
downloadu-boot-imx-386118a896554b13f14ad0f82356276988f7de82.zip
u-boot-imx-386118a896554b13f14ad0f82356276988f7de82.tar.gz
u-boot-imx-386118a896554b13f14ad0f82356276988f7de82.tar.bz2
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>
Diffstat (limited to 'include/asm-microblaze')
-rw-r--r--include/asm-microblaze/bitops.h2
1 files changed, 0 insertions, 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