diff --git a/src/cpu/x86/tsc/delay_tsc.c b/src/cpu/x86/tsc/delay_tsc.c
index 31c5bf80eb..d5cf50fab7 100644
--- a/src/cpu/x86/tsc/delay_tsc.c
+++ b/src/cpu/x86/tsc/delay_tsc.c
@@ -128,11 +128,12 @@ static unsigned long long calibrate_tsc(void)
 	delta >>= 20;
 	// save this for microsecond timing.
 	result = delta;
-	printk_spew("end %x:%x, start %x:%x\n",
-		endhigh, endlow, starthigh, startlow);
+	printk_spew("end %x, start %x\n", end, start);
 	printk_spew("32-bit delta %d\n", (unsigned long) delta);
 	
-	printk_spew(__FUNCTION__ " 32-bit result is %d\n", result);
+	printk_spew("%s 32-bit result is %d\n",
+			__FUNCTION__,
+			result);
 	return delta;
 }
 
diff --git a/src/mainboard/via/epia-m/Options.lb b/src/mainboard/via/epia-m/Options.lb
index a79a819883..4184236c5c 100644
--- a/src/mainboard/via/epia-m/Options.lb
+++ b/src/mainboard/via/epia-m/Options.lb
@@ -35,6 +35,7 @@ uses OBJCOPY
 uses DEFAULT_CONSOLE_LOGLEVEL
 uses MAXIMUM_CONSOLE_LOGLEVEL
 uses CONFIG_CONSOLE_SERIAL8250
+uses CONFIG_UDELAY_TSC
 
 ## ROM_SIZE is the size of boot ROM that this board will use.
 default ROM_SIZE  = 256*1024
@@ -53,6 +54,11 @@ default HAVE_FALLBACK_BOOT=1
 ##
 default HAVE_MP_TABLE=0
 
+##
+## Use TSC for udelay.
+##
+default CONFIG_UDELAY_TSC=1
+
 ##
 ## Build code to reset the motherboard from linuxBIOS
 ##