diff options
author | Tony Lindgren <tony@atomide.com> | 2011-01-18 20:42:23 (GMT) |
---|---|---|
committer | Tony Lindgren <tony@atomide.com> | 2011-01-19 18:38:43 (GMT) |
commit | 05b5ca9b100300c8b98429962071aa66c5d2460e (patch) | |
tree | 643c3a38bd271997c61a58d59ccdbebc1f6beb28 /arch/arm/mach-omap1/Makefile | |
parent | f376ea1780085196fcfff6bc27e8f6ddb324ae57 (diff) | |
download | linux-05b5ca9b100300c8b98429962071aa66c5d2460e.tar.xz |
omap1: Fix booting for 15xx and 730 with omap1_defconfig
For omap15xx and 730 we need to use the MPU timer
as the 32K timer is not available. For omap16xx
we want to use the 32K timer because of PM. Fix this
by allowing to build in both timers.
Signed-off-by: Tony Lindgren <tony@atomide.com>
Diffstat (limited to 'arch/arm/mach-omap1/Makefile')
-rw-r--r-- | arch/arm/mach-omap1/Makefile | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/arch/arm/mach-omap1/Makefile b/arch/arm/mach-omap1/Makefile index 6ee1950..ba6009f 100644 --- a/arch/arm/mach-omap1/Makefile +++ b/arch/arm/mach-omap1/Makefile @@ -3,12 +3,11 @@ # # Common support -obj-y := io.o id.o sram.o irq.o mux.o flash.o serial.o devices.o dma.o +obj-y := io.o id.o sram.o time.o irq.o mux.o flash.o serial.o devices.o dma.o obj-y += clock.o clock_data.o opp_data.o obj-$(CONFIG_OMAP_MCBSP) += mcbsp.o -obj-$(CONFIG_OMAP_MPU_TIMER) += time.o obj-$(CONFIG_OMAP_32K_TIMER) += timer32k.o # Power Management |