summaryrefslogtreecommitdiffstats
path: root/arch/sh/kernel/timers
diff options
context:
space:
mode:
authorPaul Mundt <lethal@linux-sh.org>2007-05-23 05:24:32 +0200
committerPaul Mundt <lethal@linux-sh.org>2007-05-23 05:24:32 +0200
commitddd43b063d16cdeffbc18f00b72c112f246fae78 (patch)
tree274d1990d18f4afc7e9b49bad25bb2f76e1b3ed4 /arch/sh/kernel/timers
parentMerge master.kernel.org:/pub/scm/linux/kernel/git/lethal/sh-2.6 (diff)
downloadlinux-ddd43b063d16cdeffbc18f00b72c112f246fae78.tar.xz
linux-ddd43b063d16cdeffbc18f00b72c112f246fae78.zip
sh: section mismatch fixes for system timer.
Fix up a couple of section mismatch warnings regarding sys_timer. Signed-off-by: Paul Mundt <lethal@linux-sh.org>
Diffstat (limited to 'arch/sh/kernel/timers')
-rw-r--r--arch/sh/kernel/timers/timer.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/arch/sh/kernel/timers/timer.c b/arch/sh/kernel/timers/timer.c
index a6bcc913d25e..4e7e747d1b69 100644
--- a/arch/sh/kernel/timers/timer.c
+++ b/arch/sh/kernel/timers/timer.c
@@ -13,7 +13,7 @@
#include <linux/string.h>
#include <asm/timer.h>
-static struct sys_timer *sys_timers[] __initdata = {
+static struct sys_timer *sys_timers[] = {
#ifdef CONFIG_SH_TMU
&tmu_timer,
#endif
@@ -26,7 +26,7 @@ static struct sys_timer *sys_timers[] __initdata = {
NULL,
};
-static char timer_override[10] __initdata;
+static char timer_override[10];
static int __init timer_setup(char *str)
{
if (str)
@@ -53,4 +53,3 @@ struct sys_timer *get_sys_timer(void)
return NULL;
}
-