clocksource: Fix !CONFIG_CLOCKSOURCE_WATCHDOG compile
authorPrarit Bhargava <prarit@redhat.com>
Fri, 22 Feb 2013 20:08:56 +0000 (15:08 -0500)
committerJohn Stultz <john.stultz@linaro.org>
Mon, 22 Jul 2013 23:00:17 +0000 (16:00 -0700)
If I explicitly disable the clocksource watchdog in the x86 Kconfig,
the x86 kernel will not compile unless this is properly defined.

Cc: John Stultz <john.stultz@linaro.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: x86@kernel.org
Signed-off-by: Prarit Bhargava <prarit@redhat.com>
Signed-off-by: John Stultz <john.stultz@linaro.org>
kernel/time/clocksource.c

Simple merge