projects
/
linux-2.6
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branches 'master', 'omap1-upstream' and 'orion' into devel
[linux-2.6]
/
arch
/
arm
/
mach-davinci
/
Makefile
diff --git
a/arch/arm/mach-davinci/Makefile
b/arch/arm/mach-davinci/Makefile
index
b86c7f0
..
99ac2e5
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 clock.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