projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'upstream'
[powerpc.git]
/
arch
/
arm
/
mach-ixp2000
/
ixdp2x00.c
diff --git
a/arch/arm/mach-ixp2000/ixdp2x00.c
b/arch/arm/mach-ixp2000/ixdp2x00.c
index
8b4a839
..
d628da5
100644
(file)
--- a/
arch/arm/mach-ixp2000/ixdp2x00.c
+++ b/
arch/arm/mach-ixp2000/ixdp2x00.c
@@
-20,7
+20,7
@@
#include <linux/mm.h>
#include <linux/sched.h>
#include <linux/interrupt.h>
#include <linux/mm.h>
#include <linux/sched.h>
#include <linux/interrupt.h>
-#include <linux/device.h>
+#include <linux/
platform_
device.h>
#include <linux/bitops.h>
#include <linux/pci.h>
#include <linux/ioport.h>
#include <linux/bitops.h>
#include <linux/pci.h>
#include <linux/ioport.h>
@@
-81,7
+81,7
@@
static void ixdp2x00_irq_mask(unsigned int irq)
dummy = *board_irq_mask;
dummy |= IXP2000_BOARD_IRQ_MASK(irq);
dummy = *board_irq_mask;
dummy |= IXP2000_BOARD_IRQ_MASK(irq);
- ixp2000_reg_wr
ite
(board_irq_mask, dummy);
+ ixp2000_reg_wr
b
(board_irq_mask, dummy);
#ifdef CONFIG_ARCH_IXDP2400
if (machine_is_ixdp2400())
#ifdef CONFIG_ARCH_IXDP2400
if (machine_is_ixdp2400())
@@
-101,7
+101,7
@@
static void ixdp2x00_irq_unmask(unsigned int irq)
dummy = *board_irq_mask;
dummy &= ~IXP2000_BOARD_IRQ_MASK(irq);
dummy = *board_irq_mask;
dummy &= ~IXP2000_BOARD_IRQ_MASK(irq);
- ixp2000_reg_wr
ite
(board_irq_mask, dummy);
+ ixp2000_reg_wr
b
(board_irq_mask, dummy);
if (machine_is_ixdp2400())
ixp2000_release_slowport(&old_cfg);
if (machine_is_ixdp2400())
ixp2000_release_slowport(&old_cfg);