---

yaml
---
r: 22828
b: refs/heads/master
c: 766636c
h: refs/heads/master
v: v3

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 110d322b29c08d8cf1dba599fd45ad2b9752a4bb
+refs/heads/master: 766636cc3630ae3b9827e7b4b1f566572963f1ef

trunk/arch/arm/mach-s3c2410/time.c

@@ -142,6 +142,12 @@ static struct irqaction s3c2410_timer_irq = {
 	.handler	= s3c2410_timer_interrupt,
 };
 
+#define use_tclk1_12() ( \
+	machine_is_bast()	|| \
+	machine_is_vr1000()	|| \
+	machine_is_anubis()	|| \
+	machine_is_osiris() )
+
 /*
  * Set up timer interrupt, and return the current time in seconds.
  *
@@ -165,7 +171,7 @@ static void s3c2410_timer_setup (void)
 
 	/* configure the system for whichever machine is in use */
 
-	if (machine_is_bast() || machine_is_vr1000() || machine_is_anubis()) {
+	if (use_tclk1_12()) {
 		/* timer is at 12MHz, scaler is 1 */
 		timer_usec_ticks = timer_mask_usec_ticks(1, 12000000);
 		tcnt = 12000000 / HZ;