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' into for-2.6.35
[pandora-kernel.git]
/
arch
/
arm
/
mach-versatile
/
Makefile
diff --git
a/arch/arm/mach-versatile/Makefile
b/arch/arm/mach-versatile/Makefile
index
ba81e70
..
97cf4d8
100644
(file)
--- a/
arch/arm/mach-versatile/Makefile
+++ b/
arch/arm/mach-versatile/Makefile
@@
-2,7
+2,7
@@
# Makefile for the linux kernel.
#
-obj-y := core.o
clock.o
+obj-y := core.o
obj-$(CONFIG_ARCH_VERSATILE_PB) += versatile_pb.o
obj-$(CONFIG_MACH_VERSATILE_AB) += versatile_ab.o
obj-$(CONFIG_PCI) += pci.o