diff options
| author | Kevin Hilman <khilman@mvista.com> | 2007-11-12 23:24:05 -0800 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2008-04-14 09:57:12 -0700 |
| commit | a57fb870c8c4864031d7568f91e882e93238c9cb (patch) | |
| tree | f6b902a2d4db8658c37034cbffe7eb53623bda7f | |
| parent | f258b0c6fa6ca653c7f4e6e2846dbb7ed3af3446 (diff) | |
| download | olio-linux-3.10-a57fb870c8c4864031d7568f91e882e93238c9cb.tar.xz olio-linux-3.10-a57fb870c8c4864031d7568f91e882e93238c9cb.zip | |
ARM: OMAP: Timer32K: Move timer32k to mach-omap1
Move now OMAP1-specific timer32k code to mach-omap1 since OMAP2/3 32k
timers are done in gptimer code.
Signed-off-by: Kevin Hilman <khilman@mvista.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
| -rw-r--r-- | arch/arm/mach-omap1/Makefile | 3 | ||||
| -rw-r--r-- | arch/arm/mach-omap1/timer32k.c (renamed from arch/arm/plat-omap/timer32k.c) | 0 | ||||
| -rw-r--r-- | arch/arm/plat-omap/Makefile | 4 |
3 files changed, 2 insertions, 5 deletions
diff --git a/arch/arm/mach-omap1/Makefile b/arch/arm/mach-omap1/Makefile index 015a66b3ca8..c06f5254c0f 100644 --- a/arch/arm/mach-omap1/Makefile +++ b/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/arch/arm/plat-omap/timer32k.c b/arch/arm/mach-omap1/timer32k.c index 1f7365f5df2..1f7365f5df2 100644 --- a/arch/arm/plat-omap/timer32k.c +++ b/arch/arm/mach-omap1/timer32k.c diff --git a/arch/arm/plat-omap/Makefile b/arch/arm/plat-omap/Makefile index d91424edf57..bc639a30d6d 100644 --- a/arch/arm/plat-omap/Makefile +++ b/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 |