From 2b63c35b96fcaacc4803f6224edb69a7178cfd87 Mon Sep 17 00:00:00 2001 From: john stultz Date: Thu, 31 Aug 2006 21:27:37 -0700 Subject: [PATCH] --- yaml --- r: 33755 b: refs/heads/master c: 30f3174d1c506db2c6d2c1dddc9c064e741d6b76 h: refs/heads/master i: 33753: 4e2f741ae60c4a26e9855cfaca11d27aedfd40d7 33751: 2d9abd9e916c7e77dc7009754bae5f48451fdcc5 v: v3 --- [refs] | 2 +- trunk/arch/i386/kernel/hpet.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index d90ca8f6af2f..2e2959f4df80 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 202af6d50155f8594ba01d8e0a54d77facc0152a +refs/heads/master: 30f3174d1c506db2c6d2c1dddc9c064e741d6b76 diff --git a/trunk/arch/i386/kernel/hpet.c b/trunk/arch/i386/kernel/hpet.c index c6737c35815d..17647a530b2f 100644 --- a/trunk/arch/i386/kernel/hpet.c +++ b/trunk/arch/i386/kernel/hpet.c @@ -35,7 +35,7 @@ static int __init init_hpet_clocksource(void) void __iomem* hpet_base; u64 tmp; - if (!hpet_address) + if (!is_hpet_enabled()) return -ENODEV; /* calculate the hpet address: */