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 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/parisc-2.6
[pandora-kernel.git]
/
arch
/
arm
/
plat-spear
/
Makefile
diff --git
a/arch/arm/plat-spear/Makefile
b/arch/arm/plat-spear/Makefile
index
eb89540
..
b4f340b
100644
(file)
--- a/
arch/arm/plat-spear/Makefile
+++ b/
arch/arm/plat-spear/Makefile
@@
-3,6
+3,6
@@
#
# Common support
-obj-y := clock.o
padmux.o
time.o
+obj-y := clock.o time.o
-obj-$(CONFIG_ARCH_SPEAR3XX) += shirq.o
+obj-$(CONFIG_ARCH_SPEAR3XX) += shirq.o
padmux.o