git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'topic/jack' into for-linus
[pandora-kernel.git]
/
arch
/
arm
/
mach-mx25
/
Makefile
diff --git
a/arch/arm/mach-mx25/Makefile
b/arch/arm/mach-mx25/Makefile
index
fe23836
..
10cebc5
100644
(file)
--- a/
arch/arm/mach-mx25/Makefile
+++ b/
arch/arm/mach-mx25/Makefile
@@
-1,3
+1,3
@@
obj-y := mm.o devices.o
obj-$(CONFIG_ARCH_MX25) += clock.o
-obj-$(CONFIG_MACH_MX25_3DS) += mx25pdk.o
+obj-$(CONFIG_MACH_MX25_3DS) += m
ach-m
x25pdk.o