diff --git a/sys/arch/arm/s3c2xx0/s3c24x0_clk.c b/sys/arch/arm/s3c2xx0/s3c24x0_clk.c
index 357090d41d48..56b91d9888b6 100644
--- a/sys/arch/arm/s3c2xx0/s3c24x0_clk.c
+++ b/sys/arch/arm/s3c2xx0/s3c24x0_clk.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: s3c24x0_clk.c,v 1.2 2003/08/04 12:41:44 bsh Exp $ */
+/*	$NetBSD: s3c24x0_clk.c,v 1.3 2003/08/27 03:57:05 bsh Exp $ */
 
 /*
  * Copyright (c) 2003  Genetec corporation.  All rights reserved.
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: s3c24x0_clk.c,v 1.2 2003/08/04 12:41:44 bsh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: s3c24x0_clk.c,v 1.3 2003/08/27 03:57:05 bsh Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -90,7 +90,7 @@ microtime(struct timeval *tvp)
 	    bus_space_read_4(sc->sc_sx.sc_iot, sc->sc_sx.sc_intctl_ioh,
 		INTCTL_SRCPND);
 	count = bus_space_read_2(sc->sc_sx.sc_iot, sc->sc_timer_ioh,
-	    TIMER_TO(4));
+	    TIMER_TCNTO(4));
 	
 	for (;;){
 
@@ -106,7 +106,7 @@ microtime(struct timeval *tvp)
 		 */
 		int_pend0 = int_pend1;
 		count = bus_space_read_2(sc->sc_sx.sc_iot, sc->sc_timer_ioh,
-		    TIMER_TO(4));
+		    TIMER_TCNTO(4));
 	}
 
 	if( __predict_false(count > timer4_reload_value) ){
@@ -175,7 +175,7 @@ read_timer(struct s3c24x0_softc *sc)
 
 	do {
 		count = bus_space_read_2(sc->sc_sx.sc_iot, sc->sc_timer_ioh,
-		    TIMER_TO(4));
+		    TIMER_TCNTO(4));
 	} while ( __predict_false(count > timer4_reload_value) );
 
 	return count;
@@ -300,13 +300,13 @@ cpu_initclocks(void)
 	timer4_reload_value = TIMER_FREQUENCY(pclk) / hz / prescaler;
 	timer4_mseccount = TIMER_FREQUENCY(pclk)/timer4_prescaler/1000 ;
 
-	bus_space_write_4(iot, ioh, TIMER_TB(4),
+	bus_space_write_4(iot, ioh, TIMER_TCNTB(4),
 	    ((prescaler - 1) << 16) | (timer4_reload_value - 1));
 
 	printf("clock: hz=%d stathz = %d PCLK=%d prescaler=%d tc=%ld\n",
 	    hz, stathz, pclk, prescaler, tc);
 
-	bus_space_write_4(iot, ioh, TIMER_TB(3),
+	bus_space_write_4(iot, ioh, TIMER_TCNTB(3),
 	    ((prescaler - 1) << 16) | (time_constant(stathz) - 1));
 
 	s3c24x0_intr_establish(S3C24X0_INT_TIMER4, IPL_CLOCK, 
diff --git a/sys/arch/arm/s3c2xx0/s3c24x0reg.h b/sys/arch/arm/s3c2xx0/s3c24x0reg.h
index 19d12dcbbd43..fca6bc297bb7 100644
--- a/sys/arch/arm/s3c2xx0/s3c24x0reg.h
+++ b/sys/arch/arm/s3c2xx0/s3c24x0reg.h
@@ -1,4 +1,4 @@
-/* $NetBSD: s3c24x0reg.h,v 1.3 2003/08/27 03:46:05 bsh Exp $ */
+/* $NetBSD: s3c24x0reg.h,v 1.4 2003/08/27 03:57:05 bsh Exp $ */
 
 /*
  * Copyright (c) 2003  Genetec corporation  All rights reserved.
@@ -188,9 +188,11 @@
 #define	 TCON_AUTORELOAD4 	(1<<22)	       /* stupid hardware design */
 #define	 TCON_AUTORELOAD(n)	((n)==4 ? TCON_AUTORELOAD4 : __TCON_AUTORELOAD(n))
 #define	 TCON_MASK(n)		(0x0f << TCON_SHIFT(n))
-#define	TIMER_TB(n) 	(0x0c+0x0c*(n))	/* count buffer */
-#define	TIMER_TCMPB(n)	(0x10+0x0c*(n))	/* compare buffer 0 */
-#define	TIMER_TO(n)	(0x14+0x0c*(n))	/* count observation 0 */
+#define	TIMER_TCNTB(n) 	 (0x0c+0x0c*(n))	/* count buffer */
+#define	TIMER_TCMPB(n)	 (0x10+0x0c*(n))	/* compare buffer */
+#define	__TIMER_TCNTO(n) (0x14+0x0c*(n))	/* count observation */
+#define	TIMER_TCNTO4	0x40
+#define	TIMER_TCNTO(n)	((n)==4 ? TIMER_TCNTO4 : __TIMER_TCNTO(n))
 
 #define	S3C24X0_TIMER_SIZE	0x44