diff options
| author | Len Brown <len.brown@intel.com> | 2005-08-11 00:56:08 -0400 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2005-08-11 00:56:08 -0400 |
| commit | 95f193aa4fe50eb2dc987081d066edd6e13027de (patch) | |
| tree | 1bf995f6290ef824ea8571520de815379d0478a3 /arch/arm/lib/bitops.h | |
| parent | e872d4cace8681838e8d18d52c92f4870e980a08 (diff) | |
| parent | bc68552faad0e134eb22281343d5ae5a4873fa80 (diff) | |
Merge ../to-linus
Diffstat (limited to 'arch/arm/lib/bitops.h')
| -rw-r--r-- | arch/arm/lib/bitops.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/arch/arm/lib/bitops.h b/arch/arm/lib/bitops.h index 2036ff15bda9..64a988c1ad44 100644 --- a/arch/arm/lib/bitops.h +++ b/arch/arm/lib/bitops.h | |||
| @@ -1,4 +1,6 @@ | |||
| 1 | #if __LINUX_ARM_ARCH__ >= 6 | 1 | #include <linux/config.h> |
| 2 | |||
| 3 | #if __LINUX_ARM_ARCH__ >= 6 && defined(CONFIG_CPU_MPCORE) | ||
| 2 | .macro bitop, instr | 4 | .macro bitop, instr |
| 3 | mov r2, #1 | 5 | mov r2, #1 |
| 4 | and r3, r0, #7 @ Get bit offset | 6 | and r3, r0, #7 @ Get bit offset |