Merge commit 'v2.6.37-rc2' into sched/core

[karo-tx-linux.git] / kernel / watchdog.c

diff --git a/kernel/watchdog.c b/kernel/watchdog.c
index 94ca779aa9c24dfdc5b08a51694f1fb7a789179b..14b8120d52320486c3006e0cffbc7c9fff84de15 100644 (file)
--- a/kernel/watchdog.c
+++ b/kernel/watchdog.c
@@ -43,7 +43,7 @@ static DEFINE_PER_CPU(unsigned long, hrtimer_interrupts_saved);
 static DEFINE_PER_CPU(struct perf_event *, watchdog_ev);
 #endif
 
-static int __initdata no_watchdog;
+static int no_watchdog;
 
 
 /* boot commands */