From f523b80900fcbe9740e0252d175cdbb75a6b5b97 Mon Sep 17 00:00:00 2001
From: David Daney <ddaney@caviumnetworks.com>
Date: Fri, 5 Nov 2010 16:17:39 -0700
Subject: [PATCH] --- yaml --- r: 221643 b: refs/heads/master c:
 433039e97f672b81e6c8f6daef385dcf035c6e29 h: refs/heads/master i:   221641:
 75daa12dffdd2cb5f8071b4431de00926deddb9e   221639:
 b6ad4bfdde2f4f69716213223b8ad21593a73451 v: v3

---
 [refs]                  | 2 +-
 trunk/kernel/watchdog.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 2792ccdb6020..a6aa98d265b7 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 4b4a2700f462102569b407102c60d3b9cf4432a0
+refs/heads/master: 433039e97f672b81e6c8f6daef385dcf035c6e29
diff --git a/trunk/kernel/watchdog.c b/trunk/kernel/watchdog.c
index bafba687a6d8..6e3c41a4024c 100644
--- a/trunk/kernel/watchdog.c
+++ b/trunk/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 */