Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik...

[linux-2.6-omap-h63xx.git] / arch / arm / mach-davinci / Makefile

diff --git a/arch/arm/mach-davinci/Makefile b/arch/arm/mach-davinci/Makefile
index a8f88cd299056ae1b52a673b2dd1b69b11de5ca0..99ac2e55774dcdf1c9b316ec9972a5d267765f89 100644 (file)
--- a/arch/arm/mach-davinci/Makefile
+++ b/arch/arm/mach-davinci/Makefile
@@ -4,7 +4,8 @@
 #
 
 # Common objects
-obj-y                  := time.o irq.o serial.o io.o id.o psc.o
+obj-y                  := time.o irq.o clock.o serial.o io.o id.o psc.o \
+                          gpio.o mux.o
 
 # Board specific
 obj-$(CONFIG_MACH_DAVINCI_EVM)  += board-evm.o