diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2005-11-02 00:32:14 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-11-02 00:32:14 -0500 |
| commit | 7f36b1e9582c06d0ddef5f2416c9b17017647d1f (patch) | |
| tree | f83cbcef623476b9b8a14f7a0cc66eb92552a651 /arch/arm/mach-ixp2000/ixdp2x00.c | |
| parent | 0e016b9fa134d79341cca5e336ccbcea066d5f81 (diff) | |
| parent | 73ee723e4c6d179c2e9496cc4caf160a18d95603 (diff) | |
Merge master.kernel.org:/home/rmk/linux-2.6-arm
Diffstat (limited to 'arch/arm/mach-ixp2000/ixdp2x00.c')
| -rw-r--r-- | arch/arm/mach-ixp2000/ixdp2x00.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/mach-ixp2000/ixdp2x00.c b/arch/arm/mach-ixp2000/ixdp2x00.c index 05dfcb48c2b6..d628da56b4bc 100644 --- a/arch/arm/mach-ixp2000/ixdp2x00.c +++ b/arch/arm/mach-ixp2000/ixdp2x00.c | |||
| @@ -81,7 +81,7 @@ static void ixdp2x00_irq_mask(unsigned int irq) | |||
| 81 | 81 | ||
| 82 | dummy = *board_irq_mask; | 82 | dummy = *board_irq_mask; |
| 83 | dummy |= IXP2000_BOARD_IRQ_MASK(irq); | 83 | dummy |= IXP2000_BOARD_IRQ_MASK(irq); |
| 84 | ixp2000_reg_write(board_irq_mask, dummy); | 84 | ixp2000_reg_wrb(board_irq_mask, dummy); |
| 85 | 85 | ||
| 86 | #ifdef CONFIG_ARCH_IXDP2400 | 86 | #ifdef CONFIG_ARCH_IXDP2400 |
| 87 | if (machine_is_ixdp2400()) | 87 | if (machine_is_ixdp2400()) |
| @@ -101,7 +101,7 @@ static void ixdp2x00_irq_unmask(unsigned int irq) | |||
| 101 | 101 | ||
| 102 | dummy = *board_irq_mask; | 102 | dummy = *board_irq_mask; |
| 103 | dummy &= ~IXP2000_BOARD_IRQ_MASK(irq); | 103 | dummy &= ~IXP2000_BOARD_IRQ_MASK(irq); |
| 104 | ixp2000_reg_write(board_irq_mask, dummy); | 104 | ixp2000_reg_wrb(board_irq_mask, dummy); |
| 105 | 105 | ||
| 106 | if (machine_is_ixdp2400()) | 106 | if (machine_is_ixdp2400()) |
| 107 | ixp2000_release_slowport(&old_cfg); | 107 | ixp2000_release_slowport(&old_cfg); |