From 08adf0e568b03b71c49feb0229d4568a822bd468 Mon Sep 17 00:00:00 2001 From: Paul Walmsley Date: Tue, 18 Mar 2008 14:41:40 +0200 Subject: [PATCH] --- yaml --- r: 91310 b: refs/heads/master c: 3d876e59c819efcc4810a5945f9d780d05e28d93 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/arch/arm/mach-omap2/Makefile | 5 ++++- trunk/arch/arm/mach-omap2/{clock.c => clock24xx.c} | 0 3 files changed, 5 insertions(+), 2 deletions(-) rename trunk/arch/arm/mach-omap2/{clock.c => clock24xx.c} (100%) diff --git a/[refs] b/[refs] index bd9f3979ff20..b1e44a654e75 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 32ab2cb9415f341913e3f33ef7566ca6e92ef283 +refs/heads/master: 3d876e59c819efcc4810a5945f9d780d05e28d93 diff --git a/trunk/arch/arm/mach-omap2/Makefile b/trunk/arch/arm/mach-omap2/Makefile index b9313c9c7420..be2b671552a6 100644 --- a/trunk/arch/arm/mach-omap2/Makefile +++ b/trunk/arch/arm/mach-omap2/Makefile @@ -3,12 +3,15 @@ # # Common support -obj-y := irq.o id.o io.o sram-fn.o memory.o control.o prcm.o clock.o mux.o \ +obj-y := irq.o id.o io.o sram-fn.o memory.o control.o prcm.o mux.o \ devices.o serial.o gpmc.o timer-gp.o # Power Management obj-$(CONFIG_PM) += pm.o pm-domain.o sleep.o +# Clock framework +obj-$(CONFIG_ARCH_OMAP2) += clock24xx.o + # Specific board support obj-$(CONFIG_MACH_OMAP_GENERIC) += board-generic.o obj-$(CONFIG_MACH_OMAP_H4) += board-h4.o diff --git a/trunk/arch/arm/mach-omap2/clock.c b/trunk/arch/arm/mach-omap2/clock24xx.c similarity index 100% rename from trunk/arch/arm/mach-omap2/clock.c rename to trunk/arch/arm/mach-omap2/clock24xx.c