---

yaml --- r: 91299 b: refs/heads/master c: a57fb87 h: refs/heads/master i: 91297: 638dbab 91295: e9f0f94 v: v3
git-mirror · Apr 14, 2008 · d488b47 · d488b47
1 parent ef22e0b
commit d488b47
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 6 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f258b0c6fa6ca653c7f4e6e2846dbb7ed3af3446
+refs/heads/master: a57fb870c8c4864031d7568f91e882e93238c9cb
diff --git a/trunk/arch/arm/mach-omap1/Makefile b/trunk/arch/arm/mach-omap1/Makefile
@@ -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

diff --git a/trunk/arch/arm/plat-omap/timer32k.c → trunk/arch/arm/mach-omap1/timer32k.c b/trunk/arch/arm/plat-omap/timer32k.c → trunk/arch/arm/mach-omap1/timer32k.c
diff --git a/trunk/arch/arm/plat-omap/Makefile b/trunk/arch/arm/plat-omap/Makefile
@@ -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