X-Git-Url: http://pilppa.org/gitweb/?a=blobdiff_plain;f=arch%2Fsh%2Fkernel%2Ftimers%2Ftimer.c;h=4e7e747d1b696c59a16016cb42aedbe516ae734b;hb=c4d36a822e7c51cd6ffcf9133854d5e32489d269;hp=dc1f631053a8175744e03e63979a9cf67618d77e;hpb=aa01666df35cd769c0957d4b3ae6ee99d680ab88;p=linux-2.6-omap-h63xx.git diff --git a/arch/sh/kernel/timers/timer.c b/arch/sh/kernel/timers/timer.c index dc1f631053a..4e7e747d1b6 100644 --- a/arch/sh/kernel/timers/timer.c +++ b/arch/sh/kernel/timers/timer.c @@ -13,14 +13,20 @@ #include #include -static struct sys_timer *sys_timers[] __initdata = { +static struct sys_timer *sys_timers[] = { #ifdef CONFIG_SH_TMU &tmu_timer, +#endif +#ifdef CONFIG_SH_MTU2 + &mtu2_timer, +#endif +#ifdef CONFIG_SH_CMT + &cmt_timer, #endif NULL, }; -static char timer_override[10] __initdata; +static char timer_override[10]; static int __init timer_setup(char *str) { if (str) @@ -47,4 +53,3 @@ struct sys_timer *get_sys_timer(void) return NULL; } -