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 'master' of /home/cbou/linux-2.6
[pandora-kernel.git]
/
arch
/
arm
/
mach-integrator
/
Makefile
diff --git
a/arch/arm/mach-integrator/Makefile
b/arch/arm/mach-integrator/Makefile
index
158daaf
..
6a5ef8d
100644
(file)
--- a/
arch/arm/mach-integrator/Makefile
+++ b/
arch/arm/mach-integrator/Makefile
@@
-4,7
+4,7
@@
# Object file lists.
# Object file lists.
-obj-y := clock.o core.o lm.o
time.o
+obj-y := clock.o core.o lm.o
obj-$(CONFIG_ARCH_INTEGRATOR_AP) += integrator_ap.o
obj-$(CONFIG_ARCH_INTEGRATOR_CP) += integrator_cp.o
obj-$(CONFIG_ARCH_INTEGRATOR_AP) += integrator_ap.o
obj-$(CONFIG_ARCH_INTEGRATOR_CP) += integrator_cp.o