Skip to content

Commit

Permalink
[ARM] 3065/1: ixp2000 typo and whitespace fixes
Browse files Browse the repository at this point in the history
Patch from Lennert Buytenhek

Misc ixp2000 typo and whitespace fixes.

Signed-off-by: Lennert Buytenhek <buytenh@wantstofly.org>
Signed-off-by: Deepak Saxena <dsaxena@plexity.net>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
  • Loading branch information
Lennert Buytenhek authored and Russell King committed Nov 1, 2005
1 parent e9b72e4 commit fa87ced
Show file tree
Hide file tree
Showing 3 changed files with 2 additions and 4 deletions.
3 changes: 1 addition & 2 deletions arch/arm/mach-ixp2000/core.c
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* arch/arm/mach-ixp2000/common.c
* arch/arm/mach-ixp2000/core.c
*
* Common routines used by all IXP2400/2800 based platforms.
*
Expand Down Expand Up @@ -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;
Expand Down
1 change: 0 additions & 1 deletion arch/arm/mach-ixp2000/ixdp2x01.c
Original file line number Diff line number Diff line change
Expand Up @@ -299,7 +299,6 @@ struct hw_pci ixdp2x01_pci __initdata = {

int __init ixdp2x01_pci_init(void)
{

pci_common_init(&ixdp2x01_pci);
return 0;
}
Expand Down
2 changes: 1 addition & 1 deletion include/asm-arm/arch-ixp2000/ixp2000-regs.h
Original file line number Diff line number Diff line change
Expand Up @@ -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 */
Expand Down

0 comments on commit fa87ced

Please sign in to comment.