Pull acpi_device_handle_cleanup into release branch

[pandora-kernel.git] / arch / arm / lib / bitops.h

diff --git a/arch/arm/lib/bitops.h b/arch/arm/lib/bitops.h
index 64a988c..5422510 100644 (file)
--- a/arch/arm/lib/bitops.h
+++ b/arch/arm/lib/bitops.h
@@ -1,6 +1,5 @@
-#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
@@ -34,7 +33,7 @@
        and     r2, r0, #7
        mov     r3, #1
        mov     r3, r3, lsl r2
-       save_and_disable_irqs ip, r2
+       save_and_disable_irqs ip
        ldrb    r2, [r1, r0, lsr #3]
        \instr  r2, r2, r3
        strb    r2, [r1, r0, lsr #3]
@@ -54,7 +53,7 @@
        add     r1, r1, r0, lsr #3
        and     r3, r0, #7
        mov     r0, #1
-       save_and_disable_irqs ip, r2
+       save_and_disable_irqs ip
        ldrb    r2, [r1]
        tst     r2, r0, lsl r3
        \instr  r2, r2, r0, lsl r3