aboutsummaryrefslogtreecommitdiffstats
path: root/arch/m68k/include/asm/bitops.h
diff options
context:
space:
mode:
Diffstat (limited to 'arch/m68k/include/asm/bitops.h')
-rw-r--r--arch/m68k/include/asm/bitops.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/m68k/include/asm/bitops.h b/arch/m68k/include/asm/bitops.h
index dda58cfe8c22..93b47b1f6fb4 100644
--- a/arch/m68k/include/asm/bitops.h
+++ b/arch/m68k/include/asm/bitops.h
@@ -311,7 +311,6 @@ static inline int bfchg_mem_test_and_change_bit(int nr,
311 * functions. 311 * functions.
312 */ 312 */
313#if defined(CONFIG_CPU_HAS_NO_BITFIELDS) 313#if defined(CONFIG_CPU_HAS_NO_BITFIELDS)
314#include <asm-generic/bitops/find.h>
315#include <asm-generic/bitops/ffz.h> 314#include <asm-generic/bitops/ffz.h>
316#else 315#else
317 316
@@ -441,6 +440,8 @@ static inline unsigned long ffz(unsigned long word)
441 440
442#endif 441#endif
443 442
443#include <asm-generic/bitops/find.h>
444
444#ifdef __KERNEL__ 445#ifdef __KERNEL__
445 446
446#if defined(CONFIG_CPU_HAS_NO_BITFIELDS) 447#if defined(CONFIG_CPU_HAS_NO_BITFIELDS)