Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit fa87cedd authored by Lennert Buytenhek's avatar Lennert Buytenhek Committed by Russell King
Browse files

[ARM] 3065/1: ixp2000 typo and whitespace fixes 



Patch from Lennert Buytenhek

Misc ixp2000 typo and whitespace fixes.

Signed-off-by: default avatarLennert Buytenhek <buytenh@wantstofly.org>
Signed-off-by: default avatarDeepak Saxena <dsaxena@plexity.net>
Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
parent e9b72e43

arch/arm/mach-ixp2000/core.c

+1 −2
Original line number Diff line number Diff line 
/*

 * arch/arm/mach-ixp2000/common.c

 * arch/arm/mach-ixp2000/core.c

 *

 * Common routines used by all IXP2400/2800 based platforms.

 *
@@ -49,7 +49,6 @@ static unsigned long ixp2000_slowport_irq_flags; 
 *************************************************************************/

void ixp2000_acquire_slowport(struct slowport_cfg *new_cfg, struct slowport_cfg *old_cfg)

{



	spin_lock_irqsave(&ixp2000_slowport_lock, ixp2000_slowport_irq_flags);



	old_cfg->CCR = *IXP2000_SLOWPORT_CCR;

arch/arm/mach-ixp2000/ixdp2x01.c

+0 −1
Original line number Diff line number Diff line
@@ -299,7 +299,6 @@ struct hw_pci ixdp2x01_pci __initdata = { 


int __init ixdp2x01_pci_init(void)

{



	pci_common_init(&ixdp2x01_pci);

	return 0;

}

include/asm-arm/arch-ixp2000/ixp2000-regs.h

+1 −1
Original line number Diff line number Diff line
@@ -252,7 +252,7 @@ 
#define IXP2000_PCI_XSCALE_INT_ENABLE	IXP2000_PCI_CSR(0x15C)



#define IXP2000_PCICNTL_PNR		(1<<17)	/* PCI not Reset bit of PCI_CONTROL */

#define IXP2000_PCICNTL_PCF		(1<<28)	/* PCI Centrolfunction bit */

#define IXP2000_PCICNTL_PCF		(1<<28)	/* PCI Central function bit */

#define IXP2000_XSCALE_INT		(1<<1)	/* Interrupt from XScale to PCI */



/* These are from the IRQ register in the PCI ISR register */