summaryrefslogtreecommitdiff
path: root/arch/arm/mach-msm/Makefile
diff options
context:
space:
mode:
authorThomas Gleixner <tglx@linutronix.de>2008-11-24 19:54:37 +0100
committerThomas Gleixner <tglx@linutronix.de>2008-11-24 19:54:37 +0100
commit3e1d7a6219ab64e13b10b1a77c0625db9a8bd8db (patch)
treec682da7317845d7b1336e3d8498cf83bdf8f5900 /arch/arm/mach-msm/Makefile
parent42569c39917a08e8de1e8b5685463be7b74baebd (diff)
parent13d428afc007fcfcd6deeb215618f54cf9c0cae6 (diff)
downloadlwn-3e1d7a6219ab64e13b10b1a77c0625db9a8bd8db.tar.gz
lwn-3e1d7a6219ab64e13b10b1a77c0625db9a8bd8db.zip
Merge branch 'linus' into core/futexes
Diffstat (limited to 'arch/arm/mach-msm/Makefile')
-rw-r--r--arch/arm/mach-msm/Makefile7
1 files changed, 4 insertions, 3 deletions
diff --git a/arch/arm/mach-msm/Makefile b/arch/arm/mach-msm/Makefile
index d12f23655850..1aa47001aa3b 100644
--- a/arch/arm/mach-msm/Makefile
+++ b/arch/arm/mach-msm/Makefile
@@ -1,7 +1,8 @@
obj-y += io.o idle.o irq.o timer.o dma.o
-
-# Common code for board init
-obj-y += common.o
+obj-y += devices.o
+obj-y += proc_comm.o
+obj-y += vreg.o
+obj-y += clock.o clock-7x01a.o
obj-$(CONFIG_MACH_HALIBUT) += board-halibut.o