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 'x86-olpc-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...
[pandora-kernel.git]
/
arch
/
arm
/
plat-versatile
/
Makefile
diff --git
a/arch/arm/plat-versatile/Makefile
b/arch/arm/plat-versatile/Makefile
index
8bb6ba6
..
16dde08
100644
(file)
--- a/
arch/arm/plat-versatile/Makefile
+++ b/
arch/arm/plat-versatile/Makefile
@@
-1,5
+1,4
@@
obj-y := clock.o
-obj-$(CONFIG_ARM_TIMER_SP804) += timer-sp.o
ifneq ($(CONFIG_ARCH_INTEGRATOR),y)
obj-y += sched-clock.o
endif