summaryrefslogtreecommitdiff
path: root/include/linux
diff options
context:
space:
mode:
authorSimon Kagstrom <simon.kagstrom@netinsight.net>2009-09-17 15:15:52 +0200
committerWolfgang Denk <wd@denx.de>2009-09-17 22:45:31 +0200
commit0413cfecea350000eab5e591a0965c3e3ee0ff00 (patch)
tree5375713a0a077db87d0d222ce591800f768a2ca5 /include/linux
parent15fba3279b56333bdb65ead366f82c945ed320d1 (diff)
downloadu-boot-imx-0413cfecea350000eab5e591a0965c3e3ee0ff00.zip
u-boot-imx-0413cfecea350000eab5e591a0965c3e3ee0ff00.tar.gz
u-boot-imx-0413cfecea350000eab5e591a0965c3e3ee0ff00.tar.bz2
Correct ffs/fls regression for PowerPC etc
Commits 02f99901ed1c9d828e3ea117f94ce2264bf8389e 52d61227b66d4099b39c8309ab37cb67ee09a405 introduced a regression where platform-specific ffs/fls implementations were defined away. This patch corrects that by using PLATFORM_xxx instead of the name itself. Signed-off-by: Simon Kagstrom <simon.kagstrom@netinsight.net> Acked-by: Kumar Gala <galak@kernel.crashing.org> Acked-by: Stefan Roese <sr@denx.de>
Diffstat (limited to 'include/linux')
-rw-r--r--include/linux/bitops.h8
1 files changed, 4 insertions, 4 deletions
diff --git a/include/linux/bitops.h b/include/linux/bitops.h
index e14e6c7..e724310 100644
--- a/include/linux/bitops.h
+++ b/include/linux/bitops.h
@@ -111,19 +111,19 @@ static inline unsigned int generic_hweight8(unsigned int w)
/* linux/include/asm-generic/bitops/non-atomic.h */
-#ifndef __set_bit
+#ifndef PLATFORM__SET_BIT
# define __set_bit generic_set_bit
#endif
-#ifndef __clear_bit
+#ifndef PLATFORM__CLEAR_BIT
# define __clear_bit generic_clear_bit
#endif
-#ifndef ffs
+#ifndef PLATFORM_FFS
# define ffs generic_ffs
#endif
-#ifndef fls
+#ifndef PLATFORM_FLS
# define fls generic_fls
#endif