diff options
author | Linus Torvalds <torvalds@g5.osdl.org> | 2005-09-07 17:00:53 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-09-07 17:00:53 -0700 |
commit | 1077682b2f97cee76a79cf38bab3fa022a97d9f8 (patch) | |
tree | e0e7dff35e3f38b9e360e702903e132c991f3f22 /arch/arm/plat-omap/Makefile | |
parent | dc9ca2af4917ce4e545fa3eb1d845c555128cabc (diff) | |
parent | bafa49cc1b800df4748b29e2b038ff029d7c8747 (diff) |
Merge master.kernel.org:/home/rmk/linux-2.6-arm
Diffstat (limited to 'arch/arm/plat-omap/Makefile')
-rw-r--r-- | arch/arm/plat-omap/Makefile | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/arch/arm/plat-omap/Makefile b/arch/arm/plat-omap/Makefile index 531e11af54d4..7e144f9cad1c 100644 --- a/arch/arm/plat-omap/Makefile +++ b/arch/arm/plat-omap/Makefile @@ -3,7 +3,7 @@ # # Common support -obj-y := common.o dma.o clock.o mux.o gpio.o mcbsp.o usb.o +obj-y := common.o sram.o sram-fn.o clock.o dma.o mux.o gpio.o mcbsp.o usb.o obj-m := obj-n := obj- := @@ -15,3 +15,5 @@ obj-$(CONFIG_ARCH_OMAP16XX) += ocpi.o obj-$(CONFIG_PM) += pm.o sleep.o obj-$(CONFIG_CPU_FREQ) += cpu-omap.o +obj-$(CONFIG_OMAP_DM_TIMER) += dmtimer.o + |