diff --git a/[refs] b/[refs]
index 5612ee5626c8..cd9d0ddcbc1c 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6af0e929e9fb60a8e2609555129713f310188f33
+refs/heads/master: b915a125112b2500d5c6fd752948afc170a49cef
diff --git a/trunk/arch/arm/plat-s3c/Makefile b/trunk/arch/arm/plat-s3c/Makefile
index f7c8824ef805..3c543ed5fb97 100644
--- a/trunk/arch/arm/plat-s3c/Makefile
+++ b/trunk/arch/arm/plat-s3c/Makefile
@@ -12,3 +12,4 @@ obj-				:=
 # Core support for all Samsung SoCs
 
 obj-y				+=  init.o
+obj-y				+= time.o
diff --git a/trunk/arch/arm/plat-s3c24xx/time.c b/trunk/arch/arm/plat-s3c/time.c
similarity index 97%
rename from trunk/arch/arm/plat-s3c24xx/time.c
rename to trunk/arch/arm/plat-s3c/time.c
index c51916236ac0..c6861a05a291 100644
--- a/trunk/arch/arm/plat-s3c24xx/time.c
+++ b/trunk/arch/arm/plat-s3c/time.c
@@ -101,7 +101,7 @@ static unsigned long s3c2410_gettimeoffset (void)
 
 	/* work out how many ticks have gone since last timer interrupt */
 
-        tval =  __raw_readl(S3C2410_TCNTO(4));
+	tval =  __raw_readl(S3C2410_TCNTO(4));
 	tdone = timer_startval - tval;
 
 	/* check to see if there is an interrupt pending */
@@ -144,7 +144,7 @@ static struct irqaction s3c2410_timer_irq = {
 	machine_is_bast()	|| \
 	machine_is_vr1000()	|| \
 	machine_is_anubis()	|| \
-	machine_is_osiris() )
+	machine_is_osiris())
 
 /*
  * Set up timer interrupt, and return the current time in seconds.
@@ -216,7 +216,7 @@ static void s3c2410_timer_setup (void)
 
 	tcnt--;
 
-	printk("timer tcon=%08lx, tcnt %04lx, tcfg %08lx,%08lx, usec %08lx\n",
+	printk(KERN_DEBUG "timer tcon=%08lx, tcnt %04lx, tcfg %08lx,%08lx, usec %08lx\n",
 	       tcon, tcnt, tcfg0, tcfg1, timer_usec_ticks);
 
 	/* check to see if timer is within 16bit range... */
@@ -247,7 +247,7 @@ static void s3c2410_timer_setup (void)
 	__raw_writel(tcon, S3C2410_TCON);
 }
 
-static void __init s3c2410_timer_init (void)
+static void __init s3c2410_timer_init(void)
 {
 	s3c2410_timer_setup();
 	setup_irq(IRQ_TIMER4, &s3c2410_timer_irq);
diff --git a/trunk/arch/arm/plat-s3c24xx/Makefile b/trunk/arch/arm/plat-s3c24xx/Makefile
index 80cf8eb211ff..8da14beda770 100644
--- a/trunk/arch/arm/plat-s3c24xx/Makefile
+++ b/trunk/arch/arm/plat-s3c24xx/Makefile
@@ -17,7 +17,6 @@ obj-y				+= irq.o
 obj-y				+= devs.o
 obj-y				+= gpio.o
 obj-y				+= gpiolib.o
-obj-y				+= time.o
 obj-y				+= clock.o
 obj-y				+= pwm-clock.o
 obj-$(CONFIG_S3C24XX_DCLK)	+= clock-dclk.o