git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input
[sfrench/cifs-2.6.git]
/
arch
/
arm
/
mach-lpc32xx
/
Makefile
diff --git
a/arch/arm/mach-lpc32xx/Makefile
b/arch/arm/mach-lpc32xx/Makefile
index f5db805ab95872bb38838a5129324ccbbedb1529..c70709ada692ed05a001131e36e63b4d15103a95 100644
(file)
--- a/
arch/arm/mach-lpc32xx/Makefile
+++ b/
arch/arm/mach-lpc32xx/Makefile
@@
-2,7
+2,6
@@
# Makefile for the linux kernel.
#
-obj-y :=
timer.o irq.o common.o serial.o clock
.o
+obj-y :=
irq.o common.o serial
.o
obj-y += pm.o suspend.o
obj-y += phy3250.o
-