diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2005-11-03 22:02:39 +0100 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2005-11-03 22:02:39 +0100 |
| commit | 5f8b1178e246422ebddc1b16487314c91edf85fe (patch) | |
| tree | 67b0b09acc80bfc1ca81f92cdad45ca156706bea /arch/arm/lib/bitops.h | |
| parent | [ARM] 3092/1: remove excessive print format padding (diff) | |
| parent | [ARM SMP] Do not clear cpu_vm_mask for VIPT caches (diff) | |
| download | linux-5f8b1178e246422ebddc1b16487314c91edf85fe.tar.xz linux-5f8b1178e246422ebddc1b16487314c91edf85fe.zip | |
[ARM] Merge SMP tree
Diffstat (limited to 'arch/arm/lib/bitops.h')
| -rw-r--r-- | arch/arm/lib/bitops.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/lib/bitops.h b/arch/arm/lib/bitops.h index 64a988c1ad44..f35d91fbe117 100644 --- a/arch/arm/lib/bitops.h +++ b/arch/arm/lib/bitops.h @@ -1,6 +1,6 @@ #include <linux/config.h> -#if __LINUX_ARM_ARCH__ >= 6 && defined(CONFIG_CPU_MPCORE) +#if __LINUX_ARM_ARCH__ >= 6 && defined(CONFIG_CPU_32v6K) .macro bitop, instr mov r2, #1 and r3, r0, #7 @ Get bit offset |