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 'timers-for-linus-cleanups' of git://git.kernel.org/pub/scm/linux/kernel...
[pandora-kernel.git]
/
arch
/
arm
/
mach-nomadik
/
Makefile
diff --git
a/arch/arm/mach-nomadik/Makefile
b/arch/arm/mach-nomadik/Makefile
index
36f67fb
..
a6bbd1a
100644
(file)
--- a/
arch/arm/mach-nomadik/Makefile
+++ b/
arch/arm/mach-nomadik/Makefile
@@
-7,7
+7,7
@@
# Object file lists.
-obj-y += clock.o
gpio.o
+obj-y += clock.o
# Cpu revision
obj-$(CONFIG_NOMADIK_8815) += cpu-8815.o