From: Jan Beulich <jbeulich@novell.com>
Date: Tue, 22 Apr 2008 15:28:41 +0000 (+0100)
Subject: x86: fix watchdog ops for CoreDuo
X-Git-Tag: v2.6.26-rc1~1045^2~25
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=86d78f640257344cc90a50da8cd52297ba1c6bdf;p=pandora-kernel.git

x86: fix watchdog ops for CoreDuo

There apparently was an unnoticed conflict between an earlier patch to
this file and mine (d1e084746b0e5806e6345ab31c5b370f8dee2b23), which
I noticed only now. I suppose a change like the one below (untested) is
needed; I didn't get any response on a confirmation request for this from
the submitter of the first patch.

The issue is the writing of the 'checkbit' member at the end of
setup_intel_arch_watchdog(), which my patch made go to intel_arch_wd_ops
rather than wd_ops.

Signed-off-by: Jan Beulich <jbeulich@novell.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
---

Reading git-diff-tree failed