diff options
Diffstat (limited to 'arch')
-rw-r--r-- | arch/arm/mach-ixp2000/core.c | 3 | ||||
-rw-r--r-- | arch/arm/mach-ixp2000/ixdp2x01.c | 1 |
2 files changed, 1 insertions, 3 deletions
diff --git a/arch/arm/mach-ixp2000/core.c b/arch/arm/mach-ixp2000/core.c index 69c6cf81a44d..c93a98b2a32c 100644 --- a/arch/arm/mach-ixp2000/core.c +++ b/arch/arm/mach-ixp2000/core.c | |||
@@ -1,5 +1,5 @@ | |||
1 | /* | 1 | /* |
2 | * arch/arm/mach-ixp2000/common.c | 2 | * arch/arm/mach-ixp2000/core.c |
3 | * | 3 | * |
4 | * Common routines used by all IXP2400/2800 based platforms. | 4 | * Common routines used by all IXP2400/2800 based platforms. |
5 | * | 5 | * |
@@ -49,7 +49,6 @@ static unsigned long ixp2000_slowport_irq_flags; | |||
49 | *************************************************************************/ | 49 | *************************************************************************/ |
50 | void ixp2000_acquire_slowport(struct slowport_cfg *new_cfg, struct slowport_cfg *old_cfg) | 50 | void ixp2000_acquire_slowport(struct slowport_cfg *new_cfg, struct slowport_cfg *old_cfg) |
51 | { | 51 | { |
52 | |||
53 | spin_lock_irqsave(&ixp2000_slowport_lock, ixp2000_slowport_irq_flags); | 52 | spin_lock_irqsave(&ixp2000_slowport_lock, ixp2000_slowport_irq_flags); |
54 | 53 | ||
55 | old_cfg->CCR = *IXP2000_SLOWPORT_CCR; | 54 | old_cfg->CCR = *IXP2000_SLOWPORT_CCR; |
diff --git a/arch/arm/mach-ixp2000/ixdp2x01.c b/arch/arm/mach-ixp2000/ixdp2x01.c index dfaaa2d281e7..a4e507c8a1d9 100644 --- a/arch/arm/mach-ixp2000/ixdp2x01.c +++ b/arch/arm/mach-ixp2000/ixdp2x01.c | |||
@@ -299,7 +299,6 @@ struct hw_pci ixdp2x01_pci __initdata = { | |||
299 | 299 | ||
300 | int __init ixdp2x01_pci_init(void) | 300 | int __init ixdp2x01_pci_init(void) |
301 | { | 301 | { |
302 | |||
303 | pci_common_init(&ixdp2x01_pci); | 302 | pci_common_init(&ixdp2x01_pci); |
304 | return 0; | 303 | return 0; |
305 | } | 304 | } |