aboutsummaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorS.Çağlar Onur <caglar@pardus.org.tr>2007-09-26 12:15:33 +0300
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2007-09-26 09:22:04 -0700
commit3dffec45c2742961dd27f55aba426cb9cf3f0dcd (patch)
tree59bdef31b193453099661d2ab243f6e0cdefe04c /drivers
parentNLM: Fix a circular lock dependency in lockd (diff)
downloadlinux-dev-3dffec45c2742961dd27f55aba426cb9cf3f0dcd.tar.xz
linux-dev-3dffec45c2742961dd27f55aba426cb9cf3f0dcd.zip
Silent drivers/char/hpet.c build warnings on i386
Following patch silents; ... drivers/char/hpet.c:72: warning: 'clocksource_hpet' defined but not used drivers/char/hpet.c:81: warning: 'hpet_clocksource' defined but not used ... build warnings on i386, they appeared after commit 3b2b64fd311c92f2137eb7cee7025794cd854057 Signed-off-by: S.Çağlar Onur <caglar@pardus.org.tr> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org> -- drivers/char/hpet.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-)
Diffstat (limited to 'drivers')
-rw-r--r--drivers/char/hpet.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/char/hpet.c b/drivers/char/hpet.c
index fd51554ab081..4c16778e3f84 100644
--- a/drivers/char/hpet.c
+++ b/drivers/char/hpet.c
@@ -62,6 +62,8 @@
static u32 hpet_nhpet, hpet_max_freq = HPET_USER_FREQ;
+/* This clocksource driver currently only works on ia64 */
+#ifdef CONFIG_IA64
static void __iomem *hpet_mctr;
static cycle_t read_hpet(void)
@@ -79,6 +81,7 @@ static struct clocksource clocksource_hpet = {
.flags = CLOCK_SOURCE_IS_CONTINUOUS,
};
static struct clocksource *hpet_clocksource;
+#endif
/* A lock for concurrent access by app and isr hpet activity. */
static DEFINE_SPINLOCK(hpet_lock);