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: */