diff options
Diffstat (limited to 'arch/arm/mach-iop13xx')
| -rw-r--r-- | arch/arm/mach-iop13xx/include/mach/uncompress.h | 1 | ||||
| -rw-r--r-- | arch/arm/mach-iop13xx/iq81340mc.c | 6 | ||||
| -rw-r--r-- | arch/arm/mach-iop13xx/iq81340sc.c | 6 | 
3 files changed, 2 insertions, 11 deletions
diff --git a/arch/arm/mach-iop13xx/include/mach/uncompress.h b/arch/arm/mach-iop13xx/include/mach/uncompress.h index fa4f80522fa..d3791ece277 100644 --- a/arch/arm/mach-iop13xx/include/mach/uncompress.h +++ b/arch/arm/mach-iop13xx/include/mach/uncompress.h @@ -20,4 +20,3 @@ static inline void flush(void)   * nothing to do   */  #define arch_decomp_setup() -#define arch_decomp_wdog() diff --git a/arch/arm/mach-iop13xx/iq81340mc.c b/arch/arm/mach-iop13xx/iq81340mc.c index e3f3e7daa79..02a8228ac2d 100644 --- a/arch/arm/mach-iop13xx/iq81340mc.c +++ b/arch/arm/mach-iop13xx/iq81340mc.c @@ -84,17 +84,13 @@ static void __init iq81340mc_timer_init(void)  	iop_init_time(bus_freq);  } -static struct sys_timer iq81340mc_timer = { -       .init       = iq81340mc_timer_init, -}; -  MACHINE_START(IQ81340MC, "Intel IQ81340MC")  	/* Maintainer: Dan Williams <dan.j.williams@intel.com> */  	.atag_offset    = 0x100,  	.init_early     = iop13xx_init_early,  	.map_io         = iop13xx_map_io,  	.init_irq       = iop13xx_init_irq, -	.timer          = &iq81340mc_timer, +	.init_time	= iq81340mc_timer_init,  	.init_machine   = iq81340mc_init,  	.restart	= iop13xx_restart,  MACHINE_END diff --git a/arch/arm/mach-iop13xx/iq81340sc.c b/arch/arm/mach-iop13xx/iq81340sc.c index e9474411163..1b80f10722b 100644 --- a/arch/arm/mach-iop13xx/iq81340sc.c +++ b/arch/arm/mach-iop13xx/iq81340sc.c @@ -86,17 +86,13 @@ static void __init iq81340sc_timer_init(void)  	iop_init_time(bus_freq);  } -static struct sys_timer iq81340sc_timer = { -       .init       = iq81340sc_timer_init, -}; -  MACHINE_START(IQ81340SC, "Intel IQ81340SC")  	/* Maintainer: Dan Williams <dan.j.williams@intel.com> */  	.atag_offset    = 0x100,  	.init_early     = iop13xx_init_early,  	.map_io         = iop13xx_map_io,  	.init_irq       = iop13xx_init_irq, -	.timer          = &iq81340sc_timer, +	.init_time	= iq81340sc_timer_init,  	.init_machine   = iq81340sc_init,  	.restart	= iop13xx_restart,  MACHINE_END  |