diff --git a/[refs] b/[refs]
index c6f962bfdd88..20c6b44c3ab0 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 255129d1e9ca0ed3d69d5517fae3e03d7ab4b806
+refs/heads/master: 3dffec45c2742961dd27f55aba426cb9cf3f0dcd
diff --git a/trunk/drivers/char/hpet.c b/trunk/drivers/char/hpet.c
index fd51554ab081..4c16778e3f84 100644
--- a/trunk/drivers/char/hpet.c
+++ b/trunk/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);