Merge branch 'topic/jack-mechanical' into to-push

[sfrench/cifs-2.6.git] / arch / arm / mach-msm / Makefile

obj-y += io.o idle.o irq.o timer.o dma.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