err.no Git - linux-2.6/commit

author	Jan Beulich <jbeulich@novell.com>
	Tue, 22 Apr 2008 15:28:41 +0000 (16:28 +0100)
committer	Ingo Molnar <mingo@elte.hu>
	Sat, 26 Apr 2008 15:35:46 +0000 (17:35 +0200)
commit	86d78f640257344cc90a50da8cd52297ba1c6bdf
tree	0d19a04db723148b9e4fddbbdf6407126f167755	tree \| snapshot
parent	b11caa7c7063ea92a0a58115d3fc6d038ed89510	commit \| diff

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>