diff options
author | Paul Walmsley <paul@pwsan.com> | 2008-03-18 08:41:40 -0400 |
---|---|---|
committer | Tony Lindgren <tony@atomide.com> | 2008-04-14 13:29:37 -0400 |
commit | 3d876e59c819efcc4810a5945f9d780d05e28d93 (patch) | |
tree | df7dd95222e10532e1e146bd8ccea6a0145a40a2 /arch/arm | |
parent | 32ab2cb9415f341913e3f33ef7566ca6e92ef283 (diff) |
ARM: OMAP2: Move clock.c to clock24xx.c
This patch moves clock.h to clock24xx.c to make room for
adding common clock code for 24xx and 34xx.
Signed-off-by: Paul Walmsley <paul@pwsan.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
Diffstat (limited to 'arch/arm')
-rw-r--r-- | arch/arm/mach-omap2/Makefile | 5 | ||||
-rw-r--r-- | arch/arm/mach-omap2/clock24xx.c (renamed from arch/arm/mach-omap2/clock.c) | 0 |
2 files changed, 4 insertions, 1 deletions
diff --git a/arch/arm/mach-omap2/Makefile b/arch/arm/mach-omap2/Makefile index b9313c9c7420..be2b671552a6 100644 --- a/arch/arm/mach-omap2/Makefile +++ b/arch/arm/mach-omap2/Makefile | |||
@@ -3,12 +3,15 @@ | |||
3 | # | 3 | # |
4 | 4 | ||
5 | # Common support | 5 | # Common support |
6 | obj-y := irq.o id.o io.o sram-fn.o memory.o control.o prcm.o clock.o mux.o \ | 6 | obj-y := irq.o id.o io.o sram-fn.o memory.o control.o prcm.o mux.o \ |
7 | devices.o serial.o gpmc.o timer-gp.o | 7 | devices.o serial.o gpmc.o timer-gp.o |
8 | 8 | ||
9 | # Power Management | 9 | # Power Management |
10 | obj-$(CONFIG_PM) += pm.o pm-domain.o sleep.o | 10 | obj-$(CONFIG_PM) += pm.o pm-domain.o sleep.o |
11 | 11 | ||
12 | # Clock framework | ||
13 | obj-$(CONFIG_ARCH_OMAP2) += clock24xx.o | ||
14 | |||
12 | # Specific board support | 15 | # Specific board support |
13 | obj-$(CONFIG_MACH_OMAP_GENERIC) += board-generic.o | 16 | obj-$(CONFIG_MACH_OMAP_GENERIC) += board-generic.o |
14 | obj-$(CONFIG_MACH_OMAP_H4) += board-h4.o | 17 | obj-$(CONFIG_MACH_OMAP_H4) += board-h4.o |
diff --git a/arch/arm/mach-omap2/clock.c b/arch/arm/mach-omap2/clock24xx.c index 5c24781f6d9b..5c24781f6d9b 100644 --- a/arch/arm/mach-omap2/clock.c +++ b/arch/arm/mach-omap2/clock24xx.c | |||