diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2011-10-31 14:07:51 +0100 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2011-10-31 14:07:51 +0100 |
| commit | 86c1e5a74af11e4817ffa6d7748d9ac1353b5b53 (patch) | |
| tree | 377327a40452c4282787f49456122bf1753a0255 /arch/arm/mach-omap1/Makefile | |
| parent | 6a8d2e2b504ce3d12cfa3934f545c9415441a5c3 (diff) | |
| parent | 3ae3e253db7385238dd9d6c67c085afa3e770a56 (diff) | |
Merge branch 'omap/dt' into next/dt
Diffstat (limited to 'arch/arm/mach-omap1/Makefile')
| -rw-r--r-- | arch/arm/mach-omap1/Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-omap1/Makefile b/arch/arm/mach-omap1/Makefile index 5b114d1558c..11c85cd2731 100644 --- a/arch/arm/mach-omap1/Makefile +++ b/arch/arm/mach-omap1/Makefile @@ -4,7 +4,7 @@ # Common support 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 reset.o pm_bus.o +obj-y += clock.o clock_data.o opp_data.o reset.o pm_bus.o timer.o obj-$(CONFIG_OMAP_MCBSP) += mcbsp.o |