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

Commit f9a8ca1c authored by Kevin Hilman's avatar Kevin Hilman Committed by Russell King
Browse files

[ARM] 3985/1: ixp4xx clocksource cleanup 



Rather than using a device_initcall() for the clocksource initialization, just call the init from the sys_timer init function.

Signed-off-by: default avatarKevin Hilman <khilman@mvista.com>
Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
parent a47d08e2

arch/arm/mach-ixp4xx/common.c

+4 −2
Original line number Diff line number Diff line
@@ -40,6 +40,8 @@ 
#include <asm/mach/irq.h>

#include <asm/mach/time.h>



static int __init ixp4xx_clocksource_init(void);



/*************************************************************************

 * IXP4xx chipset I/O mapping

 *************************************************************************/
@@ -281,6 +283,8 @@ static void __init ixp4xx_timer_init(void) 


	/* Connect the interrupt handler and enable the interrupt */

	setup_irq(IRQ_IXP4XX_TIMER1, &ixp4xx_timer_irq);



	ixp4xx_clocksource_init();

}



struct sys_timer ixp4xx_timer = {
@@ -404,5 +408,3 @@ static int __init ixp4xx_clocksource_init(void) 


	return 0;

}
 


device_initcall(ixp4xx_clocksource_init);