From d488b4713d8d8e0c9c3f691419ae31e4f77ee06a Mon Sep 17 00:00:00 2001 From: Kevin Hilman Date: Mon, 12 Nov 2007 23:24:05 -0800 Subject: [PATCH] --- yaml --- r: 91299 b: refs/heads/master c: a57fb870c8c4864031d7568f91e882e93238c9cb h: refs/heads/master i: 91297: 638dbab61a35c2dec465db301899cc6524208c17 91295: e9f0f941fadd1ce6f78c1e534c10c792b6b73d63 v: v3 --- [refs] | 2 +- trunk/arch/arm/mach-omap1/Makefile | 3 ++- trunk/arch/arm/{plat-omap => mach-omap1}/timer32k.c | 0 trunk/arch/arm/plat-omap/Makefile | 4 ---- 4 files changed, 3 insertions(+), 6 deletions(-) rename trunk/arch/arm/{plat-omap => mach-omap1}/timer32k.c (100%) diff --git a/[refs] b/[refs] index 5f4792648b93..c750e11dc0c2 100644 --- 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 index 015a66b3ca8e..c06f5254c0f3 100644 --- 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 b/trunk/arch/arm/mach-omap1/timer32k.c similarity index 100% rename from trunk/arch/arm/plat-omap/timer32k.c rename to trunk/arch/arm/mach-omap1/timer32k.c diff --git a/trunk/arch/arm/plat-omap/Makefile b/trunk/arch/arm/plat-omap/Makefile index d91424edf576..bc639a30d6d1 100644 --- 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