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 'next/timer' of git://git.linaro.org/people/arnd/arm-soc
[pandora-kernel.git]
/
arch
/
arm
/
mach-lpc32xx
/
Makefile
diff --git
a/arch/arm/mach-lpc32xx/Makefile
b/arch/arm/mach-lpc32xx/Makefile
index
a5fc5d0
..
f5db805
100644
(file)
--- a/
arch/arm/mach-lpc32xx/Makefile
+++ b/
arch/arm/mach-lpc32xx/Makefile
@@
-3,6
+3,6
@@
#
obj-y := timer.o irq.o common.o serial.o clock.o
-obj-y +=
gpiolib.o
pm.o suspend.o
+obj-y += pm.o suspend.o
obj-y += phy3250.o