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

Commit e6fea6a5 authored Jun 20, 2006 by Lennert Buytenhek Committed by Russell King Jun 20, 2006

[ARM] 3602/1: ixp23xx: fix two typos



Patch from Lennert Buytenhek

Fix two typos in include/asm-arm/arch-ixp23xx.

Signed-off-by: Lennert Buytenhek <buytenh@wantstofly.org>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>

parent 5af29e56

include/asm-arm/arch-ixp23xx/entry-macro.S

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -8,7 +8,7 @@
	.macro get_irqnr_and_base, irqnr, irqstat, base, tmp		.macro get_irqnr_and_base, irqnr, irqstat, base, tmp
	ldr \irqnr, =(IXP23XX_INTC_VIRT + IXP23XX_INTR_IRQ_ENC_ST_OFFSET)		ldr \irqnr, =(IXP23XX_INTC_VIRT + IXP23XX_INTR_IRQ_ENC_ST_OFFSET)
	ldr \irqnr, [\irqnr] @ get interrupt number		ldr \irqnr, [\irqnr] @ get interrupt number
	cmp \irqnr, #0x0 @ suprious interrupt ?		cmp \irqnr, #0x0 @ spurious interrupt ?
	movne \irqnr, \irqnr, lsr #2 @ skip unwanted low order bits		movne \irqnr, \irqnr, lsr #2 @ skip unwanted low order bits
	subne \irqnr, \irqnr, #1 @ convert to 0 based		subne \irqnr, \irqnr, #1 @ convert to 0 based

include/asm-arm/arch-ixp23xx/ixp23xx.h

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -251,7 +251,7 @@
	* CAP CSRs.		* CAP CSRs.
	****************************************************************************/		****************************************************************************/
	#define IXP23XX_GLOBAL_REG(x) ((volatile unsigned long *)(IXP23XX_CAP_CSR_VIRT + 0x4a00 + (x)))		#define IXP23XX_GLOBAL_REG(x) ((volatile unsigned long *)(IXP23XX_CAP_CSR_VIRT + 0x4a00 + (x)))
	#define IXP23XX_PROD_IDG IXP23XX_GLOBAL_REG(0x00)		#define IXP23XX_PRODUCT_ID IXP23XX_GLOBAL_REG(0x00)
	#define IXP23XX_MISC_CONTROL IXP23XX_GLOBAL_REG(0x04)		#define IXP23XX_MISC_CONTROL IXP23XX_GLOBAL_REG(0x04)
	#define IXP23XX_MSF_CLK_CNTRL IXP23XX_GLOBAL_REG(0x08)		#define IXP23XX_MSF_CLK_CNTRL IXP23XX_GLOBAL_REG(0x08)
	#define IXP23XX_RESET0 IXP23XX_GLOBAL_REG(0x0c)		#define IXP23XX_RESET0 IXP23XX_GLOBAL_REG(0x0c)