diff options
author | Tony Lindgren <tony@atomide.com> | 2011-03-29 18:54:50 -0400 |
---|---|---|
committer | Tony Lindgren <tony@atomide.com> | 2011-06-27 15:14:02 -0400 |
commit | 0f622e8cae379ee17e1ffe867336b74c5b16f958 (patch) | |
tree | 9df899f87b8bca9e35a5d448ebe5d99135f94116 /arch/arm/mach-omap2/Makefile | |
parent | 0c336dc5ec492886620d4afdc252c63f32adbd0e (diff) |
omap2+: Rename timer-gp.c into timer.c to combine timer init functions
We can keep everything sys_timer and gptimer.c related code in
timer.c as the code will be very minimal.
Later on we can also remove timer-mpu.c, as it can be called from
omap4_timer_init function.
This allows us to get rid of confusing existing files. We currently
have timer-gp.c, timer-mpu.c, and patches have been posted to add
dmtimer.c. There's no need to have these multiple files, we can
put everything into timer.c.
Signed-off-by: Tony Lindgren <tony@atomide.com>
Diffstat (limited to 'arch/arm/mach-omap2/Makefile')
-rw-r--r-- | arch/arm/mach-omap2/Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-omap2/Makefile b/arch/arm/mach-omap2/Makefile index b14807794401..adbe82d72d4e 100644 --- a/arch/arm/mach-omap2/Makefile +++ b/arch/arm/mach-omap2/Makefile | |||
@@ -3,7 +3,7 @@ | |||
3 | # | 3 | # |
4 | 4 | ||
5 | # Common support | 5 | # Common support |
6 | obj-y := id.o io.o control.o mux.o devices.o serial.o gpmc.o timer-gp.o pm.o \ | 6 | obj-y := id.o io.o control.o mux.o devices.o serial.o gpmc.o timer.o pm.o \ |
7 | common.o gpio.o dma.o wd_timer.o | 7 | common.o gpio.o dma.o wd_timer.o |
8 | 8 | ||
9 | omap-2-3-common = irq.o sdrc.o | 9 | omap-2-3-common = irq.o sdrc.o |