ARM: OMAP: Timer32K: Move timer32k to mach-omap1
authorKevin Hilman <khilman@mvista.com>
Tue, 13 Nov 2007 07:24:05 +0000 (23:24 -0800)
committerTony Lindgren <tony@atomide.com>
Mon, 14 Apr 2008 16:57:12 +0000 (09:57 -0700)
Move now OMAP1-specific timer32k code to mach-omap1 since OMAP2/3 32k
timers are done in gptimer code.

Signed-off-by: Kevin Hilman <khilman@mvista.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
arch/arm/mach-omap1/Makefile
arch/arm/mach-omap1/timer32k.c [moved from arch/arm/plat-omap/timer32k.c with 100% similarity]
arch/arm/plat-omap/Makefile

index 015a66b..c06f525 100644 (file)
@@ -5,7 +5,8 @@
 # Common support
 obj-y := io.o id.o clock.o irq.o mux.o serial.o devices.o
 
-obj-$(CONFIG_OMAP_MPU_TIMER)           += time.o
+obj-$(CONFIG_OMAP_MPU_TIMER)   += time.o
+obj-$(CONFIG_OMAP_32K_TIMER)   += timer32k.o
 
 # Power Management
 obj-$(CONFIG_PM) += pm.o sleep.o
index d91424e..bc639a3 100644 (file)
@@ -9,10 +9,6 @@ obj-m :=
 obj-n :=
 obj-  :=
 
-ifeq ($(CONFIG_ARCH_OMAP1),y)
-obj-$(CONFIG_OMAP_32K_TIMER)   += timer32k.o
-endif
-
 # OCPI interconnect support for 1710, 1610 and 5912
 obj-$(CONFIG_ARCH_OMAP16XX) += ocpi.o