summaryrefslogtreecommitdiffstats
path: root/arch/arm/include
diff options
context:
space:
mode:
authorSascha Hauer <s.hauer@pengutronix.de>2018-03-12 12:38:54 +0100
committerSascha Hauer <s.hauer@pengutronix.de>2018-03-21 12:23:02 +0100
commitbc19930ea76b4b1a1f7a69fffb36899be04923fb (patch)
tree6a96a7a55c3e31092417350b61e2eea453f68414 /arch/arm/include
parent262057db8d8af00d57e6d51dc1e67fa4a3eeed43 (diff)
downloadbarebox-bc19930ea76b4b1a1f7a69fffb36899be04923fb.tar.gz
barebox-bc19930ea76b4b1a1f7a69fffb36899be04923fb.tar.xz
ARM: bitops: remove unnecessary #ifdef
__fls() must always be provided, not only for aarch64, so remove unnecessary #ifdef. This didn't show up because nobody directly uses __fls() in barebox. Only aarch64 indirectly uses __fls() for implementing fls64(). Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to 'arch/arm/include')
-rw-r--r--arch/arm/include/asm/bitops.h2
1 files changed, 0 insertions, 2 deletions
diff --git a/arch/arm/include/asm/bitops.h b/arch/arm/include/asm/bitops.h
index 344e288bae..cd356c5e3d 100644
--- a/arch/arm/include/asm/bitops.h
+++ b/arch/arm/include/asm/bitops.h
@@ -162,9 +162,7 @@ static inline int constant_fls(int x)
#include <asm-generic/bitops/fls.h>
#endif /* __ARM__USE_GENERIC_FF */
-#if __LINUX_ARM_ARCH__ == 8
#include <asm-generic/bitops/__fls.h>
-#endif
#include <asm-generic/bitops/fls64.h>