---

yaml --- r: 372225 b: refs/heads/master c: ad38bdd h: refs/heads/master i: 372223: 06d7e41 v: v3
git-mirror · Mar 5, 2013 · 34a2324 · 34a2324
1 parent a26dbb8
commit 34a2324
Show file tree

Hide file tree

Showing 4 changed files with 1 addition and 293 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6a5a2e3b0dee0e26edeef448d7f097a2109b56bc
+refs/heads/master: ad38bdd15d5b97dcb1ffc46ea77c237e30312fbb
diff --git a/trunk/arch/arm/plat-samsung/Makefile b/trunk/arch/arm/plat-samsung/Makefile
@@ -12,7 +12,6 @@ obj-				:=
 # Objects we always build independent of SoC choice
 
 obj-y				+= init.o cpu.o
-obj-$(CONFIG_ARCH_USES_GETTIMEOFFSET)   += time.o
 obj-$(CONFIG_SAMSUNG_HRT) 	+= samsung-time.o
 
 obj-$(CONFIG_SAMSUNG_CLOCK)	+= clock.o

diff --git a/trunk/arch/arm/plat-samsung/include/plat/cpu.h b/trunk/arch/arm/plat-samsung/include/plat/cpu.h
@@ -192,10 +192,6 @@ extern void s3c24xx_init_uartdevs(char *name,
 				  struct s3c24xx_uart_resources *res,
 				  struct s3c2410_uartcfg *cfg, int no);
 
-/* timer for s5pc100 only */
-
-extern void s3c24xx_timer_init(void);
-
 extern struct syscore_ops s3c2410_pm_syscore_ops;
 extern struct syscore_ops s3c2412_pm_syscore_ops;
 extern struct syscore_ops s3c2416_pm_syscore_ops;

diff --git a/trunk/arch/arm/plat-samsung/time.c b/trunk/arch/arm/plat-samsung/time.c