diff options
author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2007-02-20 10:52:01 +0000 |
---|---|---|
committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2007-02-20 10:52:43 +0000 |
commit | e80a0e6e7ccdf64575d4384cb4172860422f5b81 (patch) | |
tree | 8960fa71eb73d0f1185e893192411cb873362738 /arch/arm/mach-iop32x/irq.c | |
parent | 3b0eb4a195a124567cd0dd6f700f8388def542c6 (diff) | |
parent | 3668b45d46f777b0773ef5ff49531c1144efb6dd (diff) |
[ARM] Merge remaining IOP code
Conflicts:
include/asm-arm/arch-at91rm9200/entry-macro.S
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'arch/arm/mach-iop32x/irq.c')
-rw-r--r-- | arch/arm/mach-iop32x/irq.c | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/arch/arm/mach-iop32x/irq.c b/arch/arm/mach-iop32x/irq.c index 8b0ac5590ae..82598dc18d8 100644 --- a/arch/arm/mach-iop32x/irq.c +++ b/arch/arm/mach-iop32x/irq.c @@ -23,16 +23,12 @@ static u32 iop32x_mask; static inline void intctl_write(u32 val) { - iop3xx_cp6_enable(); asm volatile("mcr p6, 0, %0, c0, c0, 0" : : "r" (val)); - iop3xx_cp6_disable(); } static inline void intstr_write(u32 val) { - iop3xx_cp6_enable(); asm volatile("mcr p6, 0, %0, c4, c0, 0" : : "r" (val)); - iop3xx_cp6_disable(); } static void |