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

Commit 41b6c373 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge master.kernel.org:/home/rmk/linux-2.6-arm

parents 5f6b5517 26799e67

arch/arm/mach-aaec2000/core.c

+2 −2
Original line number Diff line number Diff line
@@ -128,8 +128,8 @@ aaec2000_timer_interrupt(int irq, void *dev_id, struct pt_regs *regs) 


static struct irqaction aaec2000_timer_irq = {

	.name		= "AAEC-2000 Timer Tick",

	.flags		= SA_INTERRUPT,

	.handler	= aaec2000_timer_interrupt

	.flags		= SA_INTERRUPT | SA_TIMER,

	.handler	= aaec2000_timer_interrupt,

};



static void __init aaec2000_timer_init(void)

arch/arm/mach-clps711x/time.c

+2 −2
Original line number Diff line number Diff line
@@ -57,8 +57,8 @@ p720t_timer_interrupt(int irq, void *dev_id, struct pt_regs *regs) 


static struct irqaction clps711x_timer_irq = {

	.name		= "CLPS711x Timer Tick",

	.flags		= SA_INTERRUPT,

	.handler	= p720t_timer_interrupt

	.flags		= SA_INTERRUPT | SA_TIMER,

	.handler	= p720t_timer_interrupt,

};



static void __init clps711x_timer_init(void)

arch/arm/mach-clps7500/core.c

+2 −2
Original line number Diff line number Diff line
@@ -298,8 +298,8 @@ clps7500_timer_interrupt(int irq, void *dev_id, struct pt_regs *regs) 


static struct irqaction clps7500_timer_irq = {

	.name		= "CLPS7500 Timer Tick",

	.flags		= SA_INTERRUPT,

	.handler	= clps7500_timer_interrupt

	.flags		= SA_INTERRUPT | SA_TIMER,

	.handler	= clps7500_timer_interrupt,

};



/*

arch/arm/mach-ebsa110/core.c

+2 −2
Original line number Diff line number Diff line
@@ -173,8 +173,8 @@ ebsa110_timer_interrupt(int irq, void *dev_id, struct pt_regs *regs) 


static struct irqaction ebsa110_timer_irq = {

	.name		= "EBSA110 Timer Tick",

	.flags		= SA_INTERRUPT,

	.handler	= ebsa110_timer_interrupt

	.flags		= SA_INTERRUPT | SA_TIMER,

	.handler	= ebsa110_timer_interrupt,

};



/*

arch/arm/mach-epxa10db/time.c

+2 −2
Original line number Diff line number Diff line
@@ -56,8 +56,8 @@ epxa10db_timer_interrupt(int irq, void *dev_id, struct pt_regs *regs) 


static struct irqaction epxa10db_timer_irq = {

	.name		= "Excalibur Timer Tick",

	.flags		= SA_INTERRUPT,

	.handler	= epxa10db_timer_interrupt

	.flags		= SA_INTERRUPT | SA_TIMER,

	.handler	= epxa10db_timer_interrupt,

};



/*