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 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux...
[pandora-kernel.git]
/
arch
/
arm
/
mach-mmp
/
Makefile
diff --git
a/arch/arm/mach-mmp/Makefile
b/arch/arm/mach-mmp/Makefile
index
8f948f9
..
ba254a7
100644
(file)
--- a/
arch/arm/mach-mmp/Makefile
+++ b/
arch/arm/mach-mmp/Makefile
@@
-7,7
+7,7
@@
obj-y += common.o clock.o devices.o time.o
# SoC support
obj-$(CONFIG_CPU_PXA168) += pxa168.o irq-pxa168.o
obj-$(CONFIG_CPU_PXA910) += pxa910.o irq-pxa168.o
# SoC support
obj-$(CONFIG_CPU_PXA168) += pxa168.o irq-pxa168.o
obj-$(CONFIG_CPU_PXA910) += pxa910.o irq-pxa168.o
-obj-$(CONFIG_CPU_MMP2) += mmp2.o irq-mmp2.o
+obj-$(CONFIG_CPU_MMP2) += mmp2.o irq-mmp2.o
sram.o
# board support
obj-$(CONFIG_MACH_ASPENITE) += aspenite.o
# board support
obj-$(CONFIG_MACH_ASPENITE) += aspenite.o