diff options
| author | Linus Torvalds <torvalds@ppc970.osdl.org> | 2004-12-30 00:52:04 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2004-12-30 00:52:04 -0800 |
| commit | 368e75c65d3d337bfa323cec92a25869d64874db (patch) | |
| tree | 675a7cf1220b66d3147b4bb6ff29cc59f9d6c0e9 /include | |
| parent | 96b61dfd1452cd96ed9250bbc776656919599d73 (diff) | |
| parent | 64359c87a96e90668dd4f994ec6cbbaa503a1bea (diff) | |
Merge bk://bk.arm.linux.org.uk/linux-2.6-rmk
into ppc970.osdl.org:/home/torvalds/v2.6/linux
Diffstat (limited to 'include')
| -rw-r--r-- | include/asm-arm/arch-integrator/entry-macro.S | 1 | ||||
| -rw-r--r-- | include/asm-arm/arch-ixp2000/entry-macro.S | 5 |
2 files changed, 1 insertions, 5 deletions
diff --git a/include/asm-arm/arch-integrator/entry-macro.S b/include/asm-arm/arch-integrator/entry-macro.S index 16b5b329a58e..44f7ee613194 100644 --- a/include/asm-arm/arch-integrator/entry-macro.S +++ b/include/asm-arm/arch-integrator/entry-macro.S @@ -6,6 +6,7 @@ * This file is licensed under the terms of the GNU General Public * License version 2. This program is licensed "as is" without any * warranty of any kind, whether express or implied. + */ .macro disable_fiq .endm diff --git a/include/asm-arm/arch-ixp2000/entry-macro.S b/include/asm-arm/arch-ixp2000/entry-macro.S index bc03b72bc984..44db57c79c89 100644 --- a/include/asm-arm/arch-ixp2000/entry-macro.S +++ b/include/asm-arm/arch-ixp2000/entry-macro.S @@ -19,11 +19,6 @@ orr \base, \base, #0x0000a000 orr \base, \base, #0x08 ldr \irqstat, [\base] @ get interrupts - mov \tmp, #IXP2000_VALID_IRQ_MASK & 0xff000000 - orr \tmp, \tmp, #IXP2000_VALID_IRQ_MASK & 0x00ff0000 - orr \tmp, \tmp, #IXP2000_VALID_IRQ_MASK & 0x0000ff00 - orr \tmp, \tmp, #IXP2000_VALID_IRQ_MASK & 0x000000ff - and \irqstat, \irqstat, \tmp cmp \irqstat, #0 beq 1001f |